commdngx
Merge branch 'master' of https://github.com/Deams51/Morris

Conflicts:
	Morris.hs