remove loxck file from git
merge
Merge branch 'master' of github.com:moiseevigor/onelife-slim