merging
Merge branch 'master' of https://github.com/MarkusPfundstein/uva-image-processing