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

Conflicts:
	local.sqlite
updates to group page