gitignore add composer.lock
Merge branch 'master' of https://github.com/christopherlouet/thiefaine
change /composer.lock/ to composer.lock
change composer.lock to /composer.lock
delet composer.lock and modify .gitignore
Merge branch 'master' into dev