Finished most of the game. Minor tweaks and feature adds remain
Merge remote-tracking branch 'origin/Bret' into Integration
Merge conflict resolved.