add nav-bar menus
Merge branch 'master' of github.com:zerdliu/Aqueducts

Conflicts:
	app/views/layouts/application.html.erb