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

Conflicts:
	jshell.c
added comment