update views
Merge branch 'master' of https://github.com/mclawges22/school-discipline into mclawges22-master

Conflicts:
	county_info/templates/county_info/home.html
	county_info/views.py
remove merge conflict markers
disable ipdb
update settings.py
heroku setting added
add empty databases variable
add empty databases variable
collect static
deploy to heroku
Merge pull request #3 from mclawges22/master

CSS for home.html, data hardcoded
Merge pull request #4 from mclawges22/master

finishing up the big CSS push
adding comps to base directory