Merge pull request #4 from cmpterman2/master

Fixing the classpath to remove dependency on /home/...
Add Pump class
Merge branch 'master' of http://github.com/DougEdey/SB_Elsinore_Server

Conflicts:
	.classpath
	Elsinore.jar
Merge pull request #1 from DougEdey/master

Merging from Main Trunk