First commit
add django project files
Merge branch 'master' of https://github.com/alfonsoros88/djangour

Conflicts:
	.gitignore