Merge branch 'master' into feature/game-screen
wip parse
Fix maze generation
Merge branch 'feature/game-screen'

Conflicts:
	public/js/script.js