modified:   pi_acc.c
	modified:   pi_acc.orig.c
	modified:   test_parallel.c
Merge branch 'master' of https://github.com/lsuhpchelp/loniworkshop2014