Saving my stuff while I merge Cameron's changes
About to merge master into local branch
Merged master with local branch
Changed the GameSocketController to a singleton class so only one instance of it is created