Attempting to add front page
alsdkf
Attempting to add front page
SLDGK
Merge branch 'master' of heroku.com:columbiaconnect

Conflicts:
	columbiaconnect/urls.py