Test
Merge branch 'master' of https://github.com/erichare/585story

Conflicts:
	thestory.Rmd