kurnias modify m1.txt
Merge branch 'master' of https://github.com/suryantok/project1

Conflicts:
	m1.txt