yang kemarin
Merge branch 'master' of https://github.com/futuhal-arifin/edc

Conflicts:
	edoocatia/src/id/ac/ui/edoocatia/model/SpaceBattle.java