12 cores
commit
Merge branch 'master' of https://github.com/nickreich/BiPSandbox
12 cores
Merge branch 'master' of https://github.com/nickreich/BiPSandbox

Conflicts:
	module2/localParallelData.csv
12 cores
Merge branch 'master' of https://github.com/nickreich/BiPSandbox