if wrong
Merge branch 'master' of https://github.com/sirspock/django-example