q
Merge branch 'master' of https://github.com/justayak/ALP1

Conflicts:
	Ueb1/Aufgabe1.hs
init a2