initial django-proj,
uwsgi file added.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore