Speak!!!
Merge branch 'master' of github.com:heiankyo/heijokyo

Conflicts:
	www/webcam.html