Torch light
Merge branch 'master' of https://github.com/rikoophorst/ld31

Conflicts:
	boxes/level.box