Adding shuffling methods
Merge branch 'popTrajSet' of github.com:djoshea/trial-data into popTrajSet
Changes for resampling / shuffling