functions moved between strava.process.R and trimp.R
Merge branch 'master' of https://github.com/sachams/glucose-project
Merging file moves made on github