Conflicts:
	TeX.gitignore

Add Flask instance folder

Update Android.gitignore

Fix capitalization of KiCad

Add some files

According to their website, the correct capitalization is KiCad, not KiCAD.

Contains private configuration. Equivalent to Django's local_settings.py.

Fix capitalization of IPython

Ignore JSPM package folder

Ignore all Emacs flycheck_*.el files

work around intellij gradle wrapper refreshing bug

Added Library Mappings and VCS Root

Added Library Mappings and VCS Root

These files differ on Windows and OS X.

Added bower_components to .gitignore

matlab: ignore octave session info

fix style in Python.gitignore by adding space after #

Remove redundancy in Global/Vim.gitignore

Anything matched by `*.un~` will also be matched by the last rule, `*~`.

update Eagle.gitignore for .lck

Add ignore for .lox files from fixme package

Based on a template from jmoody

reledmac use one individual file by series of endnotes :

Update Python.gitignore

Add Code Recommenders directory

Code Recommenders introduced in Eclipse Luna (4.5) creates a .recommenders directory at the root of the workspace, like .metadata

Update JetBrains.gitignore according to the official knowledge base article

Incorrect file path

Adding more files to ignore when using minitoc

Allow for ignoring other important files and save space

Update Eagle.gitignore

DerivedData and xcuserdata are folders; *.xcuserstate is always inside

Document Vim file patterns

Add Tern plugin to Eclipse.gitignore

Add local_settings to Django's ignore

Update VisualStudio.gitignore