Merge remote-tracking branch 'origin/master'

Conflicts:
	src/game.js
	src/scenes.js
Merge pull request #3 from willmightprogram/willforked

Merge remote-tracking branch 'origin/master'