It's working!

Yay!
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ecology of Thymus3.Rmd