update
Merge branch 'master' of https://github.com/travism26/fitness-app