Delete donating.rb
Delete read_story.rb
Delete spreading_the_word_steps.rb
Delete visiting_homepage.feature
Delete read_story.feature
Delete donating.feature
fixed merge conflict