Users, can sign in and out, can use Sign up today button to create new user
Merge branch 'master' of https://github.com/timmNygren/barter_system_final

Conflicts:
	barter_system/app/views/welcome/index.html.erb
	barter_system/config/routes.rb
	barter_system/db/schema.rb