Merge branch 'develop' of https://github.com/mitjmcc/DreamStateMachine
Merge branch 'master' into develop