Initial development of game transition
Solved merge conflicts
Improvements to game transitions
Merge branch 'master' of https://github.com/DanielKeogh/SettingThingsOnFire

Merging changes