Config files
Merge branch 'master' of https://github.com/m-novikov/config-files