Merge pull request #3 from Wartz/master

Remove your eclipse project files
latest
Merge branch 'master' of https://github.com/tsclhlimmer/World-Units-to-Superior-American

Conflicts:
	bin/WorldUnitsToSuperiorAmerican.class
Merge pull request #4 from tsclhlimmer/master

Combine our stuff