Make game height/width configurable
Merge remote-tracking branch 'origin/master'

Conflicts:
	Src/game.js.map
Merge branch 'master' of https://github.com/excaliburjs/ludum-31

Conflicts:
	Src/game.js.map