kludging on train
Fix merge conflicts

Merge branch 'master' of https://github.com/JonMinton/Social_Network_Analysis

Conflicts:
	Scripts/Functions.R
	Scripts/Load_and_Prepare_Data.R
	Scripts/Merge_Pathos_With_Census.R