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

Conflicts:
	Hotel/__init__.pyc
	Hotel/admin.pyc
	Hotel/models.pyc
	Hotel/urls.pyc
	Hotel/urls_admin.pyc
	Hotel/views.pyc
	Messiah/__init__.pyc
	Messiah/settings.pyc
	Messiah/urls.pyc
	Messiah/wsgi.pyc