one more

Conflicts:
	src/main/java/com/tfoundry/pi/primo/MainMan.java