Commit prior to major change in game structure
Merge remote-tracking branch 'upstream/master'
Merge pull request #17 from Wedgebear/master

Merging progress before the overhaul