composer.json added
Merge branch 'master' of github.com:tareq1988/wp-project-manager

Conflicts:
	composer.json