Little navbar
Merge branch 'master' of github.com:team461WBI/scoutify-database

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