empty
Merge branch 'master' of github.com:vslapik/LinuxConf
fix merge mistake