server fix, cat, test app
Merge branch 'master' of https://github.com/Edifice/laser-graffiti-web

Conflicts:
	paint.html