faal
Merge branch 'master' of github.com:Chiel92/AFP

Conflicts:
	Set2/A3.hs