Stitching game together (stand back...I am performing science!)
Merge branch 'master' of https://github.com/ctortman/Good-Ideas-Forever

Conflicts:
	Good-Ideas-Forever/Assets/Scripts/GameState.cs