Some changes
Merge branch 'master' of ssh://github.com/chmullig/columbiaconnect

Conflicts:
	columbiaconnect/templates/frontend/index.html
	columbiaconnect/views.py
Merge branch 'master' of ssh://github.com/chmullig/columbiaconnect