Merge particles into master to allow master students to use the interpolator and particle tracker classes