Will's suggestion-- input checks
resolved conflicts

Merge branch 'master' of github.com:johnros/selectiveCI

Conflicts:
	selectiveCI/R/adaptedAssaf.R