ready to merge
Merge branch 'master' of https://github.com/bingdow/foxCam

Conflicts:
	index.html
manifesto type modified.