Created django project
Merge branch 'master' of github.com:briandeanda/yoamisafe

Conflicts:
	.gitignore