fixed error with frame mismatching
Fixed merge conflict with master.
Merge pull request #35 from csu-hmc/sandy

fixed error with frame mismatching
updating
Merge remote-tracking branch 'origin' into accel
Merge branch 'accel' of https://github.com/csu-hmc/Gait-Analysis-Toolkit into accel