Fixed state machine and stuff
Merge branch 'master' of https://github.com/SirCAS/ITTAPKExam
Merged and stuff