fixed errors
Merge branch 'master' of https://github.com/nok42/somekindof2dgame

Conflicts:
	server/server.c