Create project
Merge branch 'master' of https://github.com/awwa/virtual-partner

Conflicts:
	.gitignore