New Colormaps
.
Merge branch 'master' of https://github.com/igd-iva/colormap-explorer.git

Conflicts:
	output.txt
	src/main/java/colormapRegression/StatisticsTester.java
	src/main/java/colormaps/impl/Himberg98.java
Reverted StatisticsTester
Merge branch 'master' of https://github.com/igd-iva/colormap-explorer
Merge branch 'master' of https://github.com/igd-iva/colormap-explorer

Conflicts:
	src/main/java/main/ColorMapExplorer.java
Merge branch 'master' of https://github.com/igd-iva/colormap-explorer.git

Conflicts:
	src/main/java/colormaps/impl/Himberg98.java
Merge branch 'master' of https://github.com/igd-iva/colormap-explorer
Fixed Brecheisen