changes
Merge branch 'stage2' of https://github.com/ConfuddledPenguin/SimpleShell into stage2