Gitignore updated again
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	2DEngine.vcxproj
	2DEngine.vcxproj.filters