Add Pump class
Merge branch 'master' of http://github.com/DougEdey/SB_Elsinore_Server

Conflicts:
	.classpath
	Elsinore.jar