My changes
StateMachine handling states. 0 errors after build
Commit to work with master branch in stead of projectbranch
Merged projectBranch with master
proj -> master