commit and sync
Merge branch 'master' of https://github.com/bottlezz/JsMaze

Conflicts:
	nodeserver/public/index.html