Fixing composer.json syntax
Adding .gitignore
Merge branch 'develop'