moved logic in Main to Controller
Chaged stuf in GameWindow
Merge branch 'master' of https://github.com/Kuxe/oopprojekt