commit
Merge branch 'master' of https://github.com/ShanSenanayake/Edan40

Conflicts:
	assignment1/Chatterbot.hs