pembaharuan
new
Merge remote branch 'origin/master'

Conflicts:
	Pelita/src/com/example/pelita/arrayadapter/BlueAdapter.java