nothing actually
Merge branch 'master' of https://github.com/eyeswideopen/AirScratch
some resample stuff, integrated old resample method into productive code