Changes
Merge branch 'master' of https://github.com/arg-games/ld31

Conflicts:
	src/entities/tile.coffee
	src/main.coffee