sdfgv
Merge branch 'master' of github.com:Aurze/DevLivery

Conflicts:
	.gitignore