large amount of twatting about for transitions
Tweaking the alpha maps, meh
PSD changes
Merge branch 'master' into feature/transitions

Conflicts:
	src/scenes/game-scene.js