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

Conflicts:
	kolaborasi.md
Merge branch 'master' into latihan

Conflicts:
	kolaborasi.md