Status Window Update
Merge branch 'controller' of https://github.com/zolphinus/Team42Workspace into controller

Conflicts:
	roguelike42/rogue42/GameController.cpp
	roguelike42/rogue42/GameController.h
	roguelike42/rogue42/MessageWindow.cpp
	roguelike42/rogue42/main.cpp
	roguelike42/rogue42/rogue42.layout