style
Merge branch 'master' of https://github.com/mhankowsky/magic

Conflicts:
	camera.html