Refactoring code
Merge branch 'master' of https://github.com/connorclockwise/DreamStateMachine
I changed a thing!
Fixed merge conflicts.