zz
zz
Merge branch 'master' of https://github.com/nickreich/BiPSandbox

Conflicts:
	module2/permTest2_doParallel.R
	module2/slides_module2.pdf
zz
zz
Merge branch 'master' of https://github.com/nickreich/BiPSandbox

Conflicts:
	code/permTest.Rmd
	module2/localParallelData.csv
	module2/permTest2.Rmd
	module2/permTest2.md
	module2/slides_module2.pdf