Solved desynchronize problem met so far, add 'GamePrepareState'
Merge branch 'develop' of https://github.com/gsnorton/CS-547-Project-Two into develop
Merge branch 'issue25' into develop
Resolved issue25