shot
Merge branch 'master' of https://github.com/skogler/boom

Conflicts:
	src/client/Game.cpp
fix