Merge branch 'master' of https://github.com/morganecf/Yhack

Conflicts:
helpdesk/helpdesk/settings.pyc
helpdesk/helpdesk/templates/helloworld.html
helpdesk/helpdesk/urls.pyc
helpdesk/helpdesk/views/views.pyc
sup yo
asD
SDF