neues gitignore
Merge branch 'master' of github.com:sbaechler/space-invaders

Conflicts:
	.gitignore