api overhaul
Merge branch 'comments' of github.com:Cal-CS-61A-Staff/ok into comments

Conflicts:
	server/app/api.py