Merge branch 'master' of https://github.com/cookiej4u/foxCam into james

Conflicts:
	css/central.css
	index.html
	js/foxcam.js
Merge branch 'master' of https://github.com/cookiej4u/foxCam into james

Conflicts:
	css/central.css
	index.html
	js/foxcam.js
Merge branch 'master' of https://github.com/bingdow/foxCam