changed stuff
Merge branch 'master' of https://github.com/adeck/filtermen

Conflicts:
	polarization/src/main/scala/kernels/GenHSV.scala