Merge pull request #17 from Wedgebear/master

Merging progress before the overhaul
Merge remote-tracking branch 'upstream/master'
Merge pull request #18 from Wedgebear/master

Merged all the game logic into game logic
Merge remote-tracking branch 'upstream/master'