update to include leo's code
Merge branch 'master' of https://github.com/shadeofred/proj1.git

Conflicts:
	jshell.c