test
Merge branch 'master' of https://github.com/frinconr/ParallelPic
Merge branch 'master' of https://github.com/frinconr/ParallelPic

merging
tests
Merge branch 'master' of https://github.com/frinconr/ParallelPic
4