fix error log merge
Merge branch 'master' of https://github.com/TagliatL/GameWeek

Conflicts:
	Mimetic Manor/js/main.js
	Mimetic Manor/js/player.js