name changes
Merge branch 'master' of https://github.com/jeffreyyoung/track-my-fitness