updating
Merging workflows

Merge branch 'master' of github.com:noamross/age-infects

Conflicts:
	R/comparative_dynamics.Rmd