Git rebase onto master
Merge branch 'master' of https://github.com/connorclockwise/DreamStateMachine