stuff
Merge branch 'master' of github.com:sethcoder/shell
stuff