KJG 5/21/2014

caroline's additions
merge

Merge branch 'master' of https://github.com/laserpewpewpew/ConditionalEffectofReligion

Conflicts:
	RcodeRelandPol.r