Added composer-lock to .gitignore
Merge branch 'master' of github.com:eriktisme/Trinity