add game state functionality, restructured files to allow for states
resolve merge conflict from garrett into master
Merge branch 'garrettdalton-master'