Merge branch 'master' of https://github.com/Chilinot/Group52

Conflicts:
	matris.sml (reverted from commit c256fce876aaf383dcf2301bcb62bd94776a68b9)