fixes to filtering
index
Merge branch 'master' into filtering
fix DEBUG for __init__.py
Conflicts:
	server/app/__init__.py
more index
default page length
Merge branch 'master' into filtering

Conflicts:
	server/app/__init__.py
Merge pull request #218 from Cal-CS-61A-Staff/filtering

fixes to filtering