sync before merge
Merge branch 'master' of https://github.com/ImAlsoGreg/tetrode-analysis-matlab
add trode-groups to loadData
fix whitespace conflict