blatt 10
Merge branch 'master' of http://github.com/2d95/spaceshooter

Conflicts:
	game.c