Fix nav bar
Merge pull request #62 from Ajhandler/config

Fix nav bar
Merge branch 'dev' into resturant

Conflicts:
	app/views/shared/_nav.html.erb