Conflicts:
	Scala.gitignore

Added to match .cache files generated by sbt.
Current .cache/ pattern matches only directories.

Intellij's iml file can be anywhere on the path.
This is true for multi-module maven project where each module has its own $projectName.iml file in its own directory.

Added to match .cache files generated by sbt.
Current .cache/ pattern matches only directories.

revert 1f84661643

Details: `RData` is a valid file format for bundling data with an R
package based on the "Writing R Extensions" manual:
http://cran.r-project.org/doc/manuals/r-release/R-exts.html#Data-in-packages

This changes the comment to better explain what .lock-wscript is for
(it's for the [obsolete][v0.8.0] node-waf build system), and moves it
next to the other ignore pattern(s) for binary module compilation artifacts.

[v0.8.0]: http://blog.nodejs.org/2012/06/25/node-v0-8-0/

It's not the opinion of "some people", it's a conditional circumstance.
Even proponents of checking node_modules into Git agree that you
shouldn't do it when you're writing a module to be included as a
dependency on npmjs.org: the advantage of checking node_modules
into Git is only for fully-packaged apps, which is why the original
comment was what it was.

These are relatively new, the crashlytics.properties file contains the secret and can [alternatively](https://plus.google.com/+AntonioBertucci/posts/S9krjvXfgfm) contain the apikey to rid your repo of the extra strings file.

Update Umbraco.gitignore

The .settings folder contains all of the user-specific preferences for Momentics (like it does for Eclipse, since they're the same underneath). Should be local only.

"GHC creates a subdirectory .hpc in the current directory, and puts HPC index (.mix) files in there..."

https://www.haskell.org/ghc/docs/7.4.2/html/users_guide/hpc.html

Dart2js (Dart's JavaScript compiler) no longer creates `foo.dart.precompiled.js` files when compiling.

Add sourcemaps to the Sass ignore

Typo in Jetbrains gitignore

When merging branches there are usually conflicts with the CSS sourcemaps. It's not an issue to just recompile the CSS to generate a new sourcemap but having the file ignored helps to save an unnecessary step.

[Tasm] Remove template

[Target3001] Remove template

[Bancha] Remove template

Add *.userosscache to Visual Studio .gitignore

Adding new file generated by the built-in venv module in Python 3

Add .qm files to Momentics.gitignore

Ignores *.xojo_uistate

This is the new file extension for Xojo.

This .gitignore now ignores everything that build clean gets rid of

As described on https://docs.python.org/dev/library/venv.html#creating-virtual-environments

[Global/Quartus2] Remove template

I haven't found good documentation for this file online, but it is a user based file that should be ignored.

Add 'build' directory to Symfony.gitignore

Update Dart.gitignore

Adding additional comments

add the `.pub/` directory, and change the `packages` filter to match sub-folders.

Adding additional comments so that folks know to use the integration tool rather than copying this for better results.

Update Jekyll.gitignore

Create GitBook.gitignore

Ignore user-specific rproj files instead of project-specific ones

Laravel4 is the current standard.

This resolves the name with the custom Laravel.gitignore file in the
gitignore.io project. If support for Laravel3 is desired, it should be done in
a new file: "Laravel3.gitignore

Closes #1196