xmlnya hrs di commit lagi
private.properties conflict

Conflicts:
	ChipEMA/nbproject/private/private.properties