Halfway done with nav
Merge branch 'master' of https://github.com/goakley/centivize

Conflicts:
	public/index.html