storing local changes
Merge branch 'master' of https://github.com/eswalker/cos333

Merge with ed
Experiencing HttpRequestError for editing Athlete
Merge branch 'master' of https://github.com/eswalker/cos333

merge with Ed
split athlete views into edit and add
merged with Ed
merged with Ed
athlete edit and delete