.rproj.user changes
Merge branch 'master' of github.com:EricArcher/strataG

Conflicts:
	.Rproj.user/6EFDA7D1/persistent-state