kontakt
Merge branch 'master' of https://github.com/Usernamealreadynottaken/Messiah

Conflicts:
	Hotel/models.pyc
	Hotel/templates/Hotel/header.html
	Hotel/urls.py
	Hotel/urls.pyc
	Hotel/views.pyc
update kontakt