without scrollbar
Merge branch 'master' of https://github.com/GaryTan/foxCam into gary
doing scrollbar config
scrollbar ok
Merge branch 'master' of https://github.com/GaryTan/foxCam into gary
Merge branch 'gary'

Conflicts:
	css/central.css
	css/editPage.css
	index.html
	js/foxcam.js
merge from Gary's Great Work!