asdklf
Merge branch 'master' of https://github.com/chmullig/columbiaconnect
Merge branch 'master' of https://github.com/chmullig/columbiaconnect

Conflicts:
	columbiaconnect/templates/frontend/groups.html
	columbiaconnect/urls.py
	columbiaconnect/views.py