add composer & phpunit
Merge branch 'phpunit'

Conflicts:
	composer.json
	composer.lock
merged