Added composer.lock to gitignore
Merge branch 'hotfix/gitignore'