Update .gitignore
Update .gitignore
Update .gitignore
Merge branch 'master' of https://github.com/OnyxChills/2DWorldGit

Conflicts:
	.gitignore