For pull
Merge branch 'master' of github.com:nboneh/final_app

Conflicts:
	app/views/users/login.html.erb