Don't ignore composer.lock
Merge branch 'master' of github.com:FlatTurtle/Sites