small comment in getheihgt
tests
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/LinearArcPlotEditor/Arc.java
Merge branch 'master' of https://github.com/pnic/Bachelor

Conflicts:
	src/LinearArcPlotEditor/Baseline.java
	src/LinearArcPlotEditor/LAP.java
updated
updated
update