Fixed state transitions. DONT USE CONSTANTS GUYS
Merge branch 'master' of https://github.com/Zylox/GroupBeta.git