Initial commit
Fixed composer json
Merge branch 'test'