change constructors in gamestates
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
change constructors in gamestates