Update jshell.c

conflicts
Merge branch 'master' of https://github.com/shadeofred/proj1.git into branch1

Conflicts:
	jshell.c
Merge branch 'master' of https://github.com/shadeofred/proj1.git

Conflicts:
	jshell.c
cfyghgv
,,k
Merge branch 'master' into branch1

Conflicts:
	jshell.c
dfh