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

Conflicts:
	Set4/A10_3/server.hs