Created basic README.md file (already with the gitter chat badge)
Created basic git ingore file
Created basic composer.json file for the project
Fixed merge conflict