Touched
trying to force a conflict
fixed conflict

Merge branch 'master' of https://github.com/mjpdenver/wedDemo

Conflicts:
	initialRscript.R