Different navbars setup for users and nonusers on both pages.
Merge branch 'aaron_monday_1544'

Conflicts:
	app/views/welcome/index.html.erb