EllenVM/Story — pull request #1 by EllenVM (2012-12-07 17:03:44+00:00)
Title: ELLENS FIRST MERGE

I added some text here. Please take a look!