changed
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/jlgrock/learning_story

Conflicts:
	SimpleStory.txt
Merge branch 'master' of https://github.com/jlgrock/learning_story

Conflicts:
	SimpleStory.txt