Merge "Remove composer.json from .gitignore"