putting some code in to check for overlapping particles
Merge branch 'attributeMatrix' of https://github.com/dream3d/DREAM3D into attributeMatrix
small changes
fixing merge issue