fix
Merge branch 'master' of github.com:mjruschak/fitmotivation-api