"added to navbar"
Merge branch 'master' of https://github.com/tcase360/restaurant2

Conflicts:
	config/routes.js
	public/js/controllers/restaurant-add.js