Manually merge
toolbar okay
central.css
Merge branch 'master' of https://github.com/GaryTan/foxCam into gary

Conflicts:
	css/central.css
	index.html
Merge branch 'gary'

Conflicts:
	css/central.css
	index.html