Changed Jman to Orange
Merge remote-tracking branch 'origin/master'
JvaMan is Speed incarnate.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Java_Man/Screen.java