added some stuff
Merge branch 'master' of https://github.com/ags2121/web_dev_final_project

Conflicts:
	app/app/controllers/sessions_controller.rb
	app/app/views/users/show.html.erb
adding users/show changes