added user name erb
added log in and logout link changing
added redirects to dashboard from login
Resolved merge conflicts within the index.rb and navbar

Conflicts:
	app/views/index.erb
	app/views/partials/_navbar.erb