figuring out the camera stuff
Merge branch 'master' of https://github.com/litopia/unicat

Conflicts:
	index.html