init project
Merge branch 'master' of github.com:chilian/delivery_consultant

Conflicts:
	.gitignore