cocktails und bastis lösung
.
Merge branch 'master' of https://github.com/PatMosby/PI3-WS13

Conflicts:
	04/uebung04.hs