Now creating AllHistData.rda.
Cleaned up conflict.

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

Conflicts:
	Scripts/PreProcess.R