update
Merge branch 'master' of https://github.com/zsbali/linux_scripts