commit
added nav
Merge branch 'Branch_3bbcb72b4fce7c4ba4c742b53d3b398b4b10565d'

Conflicts:
	controllers/users.js
	views/shared/navigation.ejs