Updating analysis.R.
Merge branch 'master' of https://github.com/mortonjt/SCOPE

Conflicts:
	sim/analysis.R