merging
fixed merge conflicts
Merge branch 'master' of https://github.com/mfulgencio/ParallelParticleSystem