merge conflict
Merge branch 'master' of https://github.com/joklawitter/yMonotonePolygon

Conflicts:
	src/yMonotonePolygon/QUI/YMonotonePolygonQUI.java