"fixing conflicts"
Merge branch 'first_stories' of https://github.com/Bdaya/BloodDonation into first_stories

Conflicts:
	app/controllers/users_controller.rb
	log/development.log
a user can view his replies