Crap
Merge branch 'master' of https://github.com/Frotty/Dap2Praktikum

Conflicts:
	src/blatt06/Anwendung.java
	vorlagenblatt06/datenBsp1.zahlen