simple
Merge branch 'master' of https://github.com/marc-diaz/first_project.git

Conflicts:
	story.txt