test conflict
resolving conflict using Matt's addition

Merge branch 'master' of https://github.com/kdyson/SC_R

Conflicts:
	testRscript.R