Conflicts:
	Node.gitignore

Enable Ignore of NuGet Packages Folder By Default

Adding a global template for EiffelStudio

Simplify sass cache rules

Added rule for directory config under KDE to Linux template

Dolphin, the KDE file manager, writes specific directory configuration in .directory files.

Add an Idris template

Update Leiningen.gitignore with checkouts and lein-failures rules

Fix typo in Haskell template

Ignore signed pom files in leiningen projects

Ignore log of applied patches in Magento.gitignore

Submitting this for consideration.

The first thing that I do on every new project is to go in and uncomment the packages folder. With the prevalence of NuGet and prominence of its use in the Visual Studio environment, along with how well package restore *just works* now, I believe this should be the default.

While I understand that package restore isn't on by default, I would argue that the types of developers using NuGet _and_ a distributed SCM are the types of developers that would omit the binaries from source control.

Magento keeps a log of official patches applied in this file.

Pom files are commonly signed before deploy as part of the build/signoff process

Removed IDE-specific rules from Grails template

Those files should be in Global/ templates

This entry should be (and is) rather in Global/JetBrains.gitignore

Updated rules of 'VisualStudio.gitignore' about ATL Project.

This commit Makes VisualStudio.gitignore ignore the three items below. It needs when you create an ATL Project.

* [Dd]ebugPS/
* [Rr]eleasePS/
* dlldata.c

ignore SQL server database files

Updated the year :-)

Better Delphi .gitignore

Ignore output from Crashlytics JetBrains plugin

* Remove AndroidStudio.gitignore in favor of adding the
  change needed to the Global/JetBrains.gitignore file

- added header with link to official documentation about Delphi filetypes
- added some missed file extensions
- made some grouping with descriptions