trying to add trip buddies to navbar
Merge branch 'add_posters_to_navbar' to master

Conflicts:
	app/assets/stylesheets/base_style.css
	app/views/layouts/application.html.erb