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

Conflicts:
	Hotel/urls.pyc
	Hotel/views.pyc