my django server
Merge branch 'django-test' of https://github.com/shwe87/proyecto_shweta into django-test
my django server