I forgot to commit last time :(
Merge branch 'master' of https://github.com/emassey2/project2-shell

Conflicts:
	mysh.c
trying to get everyone on the same page