Edit 2nd line of "story.txt".
Merge branch 'test'

Conflicts:
	story.txt
Remove the redundant line.
Merge pull request #1 from summerj/master

Please do a code review, thanks!
Add 1 more line to story.txt.