Temporarily Undo Steve's Changes
Merge branch 'dev' of https://github.com/moduli/Labyrinth into dev

Conflicts:
	index.html
Merge branch 'dev'