moved code around and removed switch on Strings
Merge branch 'master' of https://github.com/Natolumin/pact-webservice
modified a few exceptions and cleaned up binaries and stuff
Conflicts:
	src/format/JSONFormatter.java