edit api
Merge branch 'master' of https://github.com/blairnangle/Academy2_Agile
edited api