Merged?
Merge branch 'master' of ssh://github.com/chmullig/columbiaconnect

Conflicts:
	columbiaconnect/views.py
	local.sqlite
Merge branch 'master' of ssh://github.com/chmullig/columbiaconnect