blahblahblah
Merge branch 'master' of ssh://git@github.com/backenklee/proinf-3.git

Conflicts:
	Uebung-2/src/aufgaben/Auf02.java
Merge branch 'master' of ssh://git@github.com/backenklee/proinf-3.git
Merge remote-tracking branch 'origin/master'

Conflicts:
	Uebung-2/src/aufgaben/Auf01.java
	Uebung-2/src/aufgaben/Auf02.java
Merge branch 'master' of ssh://git@github.com/backenklee/proinf-3.git

Conflicts:
	Uebung-2/src/aufgaben/Auf05.java