Merge branch 'master' of github.com:ader1990/configs