Return the weights for an athlete
Merge branch 'brian/controllers'

merging with ed