rename folders
deleted data folder
deleted data folder
local changes, equal to merge
merge what we can

Merge branch 'master' of https://github.com/bquast/South-Africa

Conflicts:
	.RData
	estimate.R