debugging
Merge branch 'master' of https://github.com/rtoussaint/os_shell

Conflicts:
	dsh.c