fixed bug due to incorrect api specification
Merge branch 'master' of github.com:chapmans/170-project