Saving to merge changes with Jedd
trying to fix game controller
Merged changes in GameController