Created a separate gameplay state.
Merged branch "robert" with branch "Cole\'s-Branch"