disuruh commit
Merge branch 'master' of https://github.com/futuhal-arifin/edc

Conflicts:
	edoocatia/bin/id/ac/ui/edoocatia/Edoocatia.class
	edoocatia/src/id/ac/ui/edoocatia/Edoocatia.java