Merge pull request #31 from Cal-CS-61A-Staff/api_errors

Api errors
Merge branch 'master' into model_key