Map Switchig works
Merge branch 'master' of https://github.com/apepers/599-roguelike

Conflicts:
	Roguelike/src/game/Controller.java
Merge branch 'master' of https://github.com/apepers/599-roguelike