Init commit
Merge branch 'master' of github.com:mattack108/djcroco

Conflicts:
	.gitignore