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

Conflicts:
	Makefile
	game.c
	game_client.c
	test-server.c