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

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

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