First commit using django-skel!
Merge branch 'master' of github.com:PedroPadilla/PedroV1

Conflicts:
	.gitignore