Jason's Piece
create story.txt
Jason and Tricia
Merge branch 'master' of https://github.com/jessicameyer/story

Conflicts:
	story.txt
Merge branch 'master' of https://github.com/jessicameyer/story
15 is set
15 is set by jason
15 is set by jason
Merge branch 'master' of https://github.com/jessicameyer/story
Jason finishes his task
15 is set by jason
Merge branch 'master' of https://github.com/jessicameyer/story
Merged master
15 is set by jason
15 is set by jason
15 is set by jason