added marvin's intro
Add winter orange beginning
Added musings about veggie bacon
added lines to fail_win
Animal Nitrate commit
Merge pull request #1 from ankushg/marvinthegreencow

added an intro for Marvin the Green Cow
Merge pull request #4 from lapentab/lapentab/winter_orange

Add winter orange beginning
Merge pull request #6 from adataylor/master

Added musings about veggie bacon
Update Smashing_Cantaloupe.txt

changed content to create a conflict.
Merge pull request #12 from truelight727/stories

added lines to fail_win
Merge pull request #14 from shilpamagrawal15/feature

Animal Nitrate commit
Add beginning of price tag story
Initial content for the price_tag file
Add to price tag story
Add changes to the Candle_Issue.txt
Merge pull request #17 from lapentab/lapentab/price_tag

Lapentab/price tag
Merge pull request #19 from birkanu/feature_branch

Add changes to the Candle_Issue.txt
Added to the Green Cow story.
Merge pull request #22 from hallamoore/add_story

Added to the Green Cow story.
resolved merge conflicts