ganti so
Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaApplication1/src/javaapplication1/main.java