Initial django cookie cutter commit
Merge branch 'master' of github.com:somethingnew2-0/distadmin

Conflicts:
	.gitignore