new
haha

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

Conflicts:
	StoryFile.md