some work done
 some more work done
Merge branch 'master' of https://github.com/shadeofred/proj1.git

Conflicts:
	.README.txt.swp
	jshell.c