add composer.lock to gitignore
Merge branch 'master' of github.com:wkjagt/InfraredAdmin