Merge branch 'master' of github.com:Athlete/athlete-api-docs