rootScope total, styles
Merge branch 'master' of https://github.com/tmlayton/globalhack

Conflicts:
	public/index.html
	public/scripts/8b6db009.scripts.js
	public/styles/09f9b3d3.main.css
	public/styles/307c3296.main.css
	public/styles/6e289a6f.main.css