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

Conflicts:
	src/client/Game.hpp
Merge branch 'master' of https://github.com/skogler/boom