sky
Merge branch 'master' of https://github.com/Stoney-FD/zombieloveaffair

Conflicts:
	assets/scenes/graveyard/scene.html
	assets/scenes/graveyard/scene.js
	style/scenes.less
Merge branch 'master' of https://github.com/Stoney-FD/zombieloveaffair

Conflicts:
	assets/scenes/graveyard/scene.html