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

Conflicts:
	story.txt