change color
Merge branch 'master' of https://github.com/taxfromdk/TeaterApp

Conflicts:
	sqlite.db
	teaterapp/show/templates/base.html
	teaterapp/show/views.py