Fixed state machine
Merge branch 'master' of https://github.com/Doolan/CSSE232_Parts