Merge pull request #2 from AaronLlanos/master

pulling
Merge http://github.com/AaronLlanos/-CS439-Project-0
Tarik
Merge branch 'master' of https://github.com/tarik90/-CS439-Project-0 into tarik90-master

Conflicts:
	proj0/design_doc.txt
	proj0/msh.c
Merge branch 'tarik90-master'

 the commit.
msh test12