working on reply
discard this
trying to merge
Merge branch 'first_stories' of https://github.com/Bdaya/BloodDonation into first_stories

Conflicts:
	app/controllers/users_controller.rb
	app/models/request.rb
	app/models/user.rb
	app/views/users/home.html.erb
	app/views/users/show.html.erb
	config/routes.rb
	log/development.log
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af