hello
Merge branch 'master' of https://github.com/dr01d3k4/CosmicZendeskHack
s
Conflicts:
	cosmic_hack/models.pyc
	cosmic_hack/urls.pyc
	cosmic_hack/views.pyc
Merge branch 'master' of https://github.com/dr01d3k4/CosmicZendeskHack
Merge branch 'master' of https://github.com/dr01d3k4/CosmicZendeskHack

Conflicts:
	CosmicZendeskHack/settings.pyc
Merge branch 'master' of https://github.com/dr01d3k4/CosmicZendeskHack

Conflicts:
	cosmic_hack/__init__.pyc
	cosmic_hack/admin.pyc
	cosmic_hack/models.pyc
	cosmic_hack/urls.pyc
	cosmic_hack/views.pyc
Merge branch 'master' of https://github.com/dr01d3k4/CosmicZendeskHack
Merge branch 'master' of https://github.com/dr01d3k4/CosmicZendeskHack