yup
Merge branch 'master' of https://github.com/jcauteru/y_stable

Conflicts:
	Case_Studies/horses/finalfastcode.R