Work done on shell. Still need clean up and some work
Merge branch 'master' of https://github.com/mvazque/cmsi387