Integrated changes
Merge branch 'master' of github.com:flexyford/story_git_project

Conflicts:
	story.txt
made changes Merge branch 'master' of github.com:flexyford/story_git_project

Conflicts:
	story.txt