I forgot what I did
Merge branch 'master' of https://github.com/shiyingzheng/hw10

Conflicts:
	shell.c
I don't actually know what I did
Merge branch 'master' of https://github.com/shiyingzheng/hw10

Conflicts:
	shell.c
took out a line of git crap