FIX: Studierende
FIX: Studierende
FIX: Studierende
FIX: Studierende
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/Line.java
Merge remote-tracking branch 'origin/master'
ADD: pointDistance
ADD: static test in Line.java for Patrick