more git shit
Merge branch 'master' of https://github.com/bluevibes/shell
git and git1 merged