Merge pull request #21 from Wedgebear/master

General code cleanup and added GameManager
Merge remote-tracking branch 'upstream/master'
Made GameLogic pull the settings via GameManager