Log fix
Merge branch 'master' of https://github.com/RikoOphorst/LD31

Conflicts:
	js/level/player.js