Temporary commit in order to preserve changes during merge
Merge branch 'master' of https://github.com/jwinder1/ConfRescale

Conflicts:
	src/IsotonicRegression/IsotonicRegression.java