Lantern flicking
Merge branch 'master' of https://github.com/rikoophorst/ld31
Merge branch 'master' of https://github.com/rikoophorst/ld31

Conflicts:
	js/level/player.js