better preservation of type s
merging.

Merge branch 'master' of github.com:MatthewHeun/Econ-Growth-R-Analysis

Conflicts:
	CES.Rnw