Update gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
Revert "Merge remote-tracking branch 'origin/master'"

This reverts commit 545becf2d2f9525318e4999eb880b969d603e341.