Merging stories
merge conflict resolved

Merge branch 'master' of https://github.com/sctyner/NormalStory

Conflicts:
	StoryFile.Rmd
	StoryFile.md