chnge
Merge branch 'master' of https://github.com/freddie-freeloader/Source

Conflicts:
	Ex1.hs