let me try that again
Merge branch 'master' of https://github.com/adamwmeek/PSOC-Treadmill