resize
Merge branch 'master' of https://github.com/akohen/ld30

Conflicts:
	public/game/player.js