Home page display...trying to get static files serving
Merge branch 'master' of heroku.com:columbiaconnect
blah
Merge branch 'master' of heroku.com:columbiaconnect

Conflicts:
	columbiaconnect/urls.py