Modify app layout
Merge remote master into local
Modify signed_in partial for nav
Merge branch 'master' of github.com:bemartinson926/TrailMagic

Conflicts:
	app/views/layouts/shared/_signed_in.html.erb
Merge branch 'master' of github.com:bemartinson926/TrailMagic

Conflicts:
	app/views/layouts/shared/_nav_search.html.erb
	app/views/layouts/shared/_signed_in.html.erb