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

Conflicts:
	Hotel/models.pyc
	Hotel/views.pyc
	Messiah/settings.py
	Messiah/settings.pyc
	Messiah/urls.pyc