Fixed type issues.
Merge branch 'api_overhaul' of github.com:Cal-CS-61A-Staff/ok into api_overhaul