Begun dealing with &
Merge branch 'master' of http://github.com/dlim2010/JShell

Conflicts:
	.project
	bin/Shell.class
	src/shell.java
Merged with other repos