found 6 and 7
Merge branch 'master' of https://github.com/JessicaMeyer/story

Conflicts:
	story.txt
found 6 and 7
found 6 and 7