put in order
Merge branch 'master' of https://github.com/flexyford/story_git_project

Conflicts:
	story.txt