Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/flexyford/story_git_project

Conflicts:
	story.txt