versi 4

bentrok 2
Merge branch 'master' of https://github.com/helmynix/latihan_project1

Conflicts:
	Latihan_Project1/src/latihan_project1/Latihan_Project1.java