ignore these files
Merge branch 'master' of https://github.com/balcides/spaceFighter

Conflicts:
	.gitignore