Addieren
Merge remote-tracking branch 'origin/master'

Conflicts:
	TPE/uebungen/src/tpe/fruh_razzaq_jando/pue1/Bruch.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	TPE/uebungen/src/tpe/fruh_razzaq_jando/pue1/Bruch.java
Merge remote-tracking branch 'origin/master'
Addieren