update
Merge branch 'controller' of https://github.com/zolphinus/Team42Workspace into controller

Conflicts:
	roguelike42/rogue42/GameController.cpp
	roguelike42/rogue42/MapReader.h
	roguelike42/rogue42/StatsWindow.h