HUGE commit!!
-Basically set up the foundation for the game
The play state, left out of the previous commit
Merge remote-tracking branch 'origin/master'