some changes
Merge branch 'master' of https://github.com/chmullig/columbiaconnect
Blah
static files collected
Static files being served now
connected to admin
Database shit.
Merge branch 'master' of heroku.com:columbiaconnect