Edit by Essolo
Merge pull request #20 from essolo/mzm2

Edit by Essole
Merge branch 'master' of https://github.com/pesima/pesima

Conflicts:
	kolaborasi.md