Game states
Merge remote-tracking branch 'origin/master'

Conflicts:
	StickFight.cpp
Merge branch 'master' of https://github.com/curtismj1/Stick-Fight