further .gitignore changes
Merge branch 'master' of github.com:dwieeb/Fox-Dash-Two-Level-Editor

Conflicts:
	.gitignore