Nav Update
Merge branch 'master' of https://github.com/Leeboy6610/atticbase

Conflicts:
	public/js/nav.js