final edit
Merge branch 'master' of https://github.com/codemania113/django-project