Transition changes
Merge branch 'master' of https://github.com/Merowm/Bad-Dreams