Fixed sorting.

Conflicts:
	server/app/api.py
Merge branch 'design_integration' of github.com:Cal-CS-61A-Staff/ok into design_integration