Implement layer swapping, remove merge artifacts
Merge branch 'logicGrid' of github.com:netcreator/gravedanger into logicGrid

Conflicts:
	index.html
Merge branch 'logicGrid' of github.com:netcreator/gravedanger into logicGrid

Conflicts:
	scripts/playing.js