Updated GameManager, as well as LevelController
Trying to merge my previous commit
Merge branch 'fightingteam' of https://github.com/duke-compsci308-spring2013/vooga into fightingteam