Modest Background
Merge branch 'master' of https://github.com/caolan/gamejam

Conflicts:
	www/resources/sprites/spells/spells.json
Merge branch 'master' of https://github.com/caolan/gamejam