initial stuff for 3
Merge branch 'master' of github.com:Chiel92/AFP

Conflicts:
	Set2/A4_2.hs
small changes in 4.2