searchworks
Merge https://github.com/davidbliu/hackjam
davids stuff
Merge https://github.com/davidbliu/hackjam

Conflicts:
	CollabPortal/CollabPortal/urls.pyc
	CollabPortal/StudentPortal/models.pyc
	CollabPortal/StudentPortal/views.pyc
	CollabPortal/portal_db
	CollabPortal/templates/base.html
fixed merge conflicts