[JBI]

Wireframe and color mode
Merge branch 'master' of https://github.com/bombermen/Surface

Conflicts:
	index.html
	surface.js