added 4 maps in the game-class
Merge branch 'master' of https://github.com/skogler/boom

Conflicts:
	src/client/Game.cpp
fixed compile error after merge