some git
Merge branch 'master' of github.com:m3m0ry/config