Fixing merge conflict
Merge branch 'master' of https://github.com/jbartolozzi/DynamicFracturing
explode
checked out ours