Initial commit
Adding composer.json
Fixing conflict