Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/camera.js
	test.html

It works!

Hail the gods!