Updates
Merge branch 'master' of https://github.com/CommonEconomist/Shocks-and-Onset

Conflicts:
	README.md
	README.md~