init2
Merge branch 'master' of github.com:kmdevel/anotherdockerdjango

Conflicts:
	.gitignore
	README.md