add hasil pull
Merge branch 'master' of https://github.com/tikes-03/medrecappx

Conflicts:
	build/built-jar.properties
	build/built-jar.properties.orig
	build/classes/medrecappx/Gui/FrmUtama$1.class
	build/classes/medrecappx/Gui/FrmUtama$10.class
	build/classes/medrecappx/Gui/FrmUtama$11.class
	build/classes/medrecappx/Gui/FrmUtama$12.class
	build/classes/medrecappx/Gui/FrmUtama$13.class
	build/classes/medrecappx/Gui/FrmUtama$14.class
	build/classes/medrecappx/Gui/FrmUtama$2.class
	build/classes/medrecappx/Gui/FrmUtama$3.class
	build/classes/medrecappx/Gui/FrmUtama$4.class
	build/classes/medrecappx/Gui/FrmUtama$5.class
	build/classes/medrecappx/Gui/FrmUtama$6.class
	build/classes/medrecappx/Gui/FrmUtama$7.class
	build/classes/medrecappx/Gui/FrmUtama$8.class
	build/classes/medrecappx/Gui/FrmUtama$9.class
	build/classes/medrecappx/Gui/FrmUtama.class
	build/test/results/TEST-medrecappx.Service.A_SpesialisServiceTest.xml
	build/test/results/TEST-medrecappx.Service.B_SpesialisGuiServiceTest.xml
	build/test/results/TEST-medrecappx.Service.C_JaminanServiceTest.xml
	build/test/results/TEST-medrecappx.Service.D_JaminanGuiServiceTest.xml
	build/test/results/TEST-medrecappx.Service.E_StafServiceTest.xml
	build/test/results/TEST-medrecappx.Service.F_StafGuiServiceTest.xml
	build/test/results/TEST-medrecappx.Service.G_ObatServiceTest.xml
	build/test/results/TEST-medrecappx.Service.H_ObatGuiServiceTest.xml
	build/test/results/TEST-medrecappx.Service.I_PasienServiceTest.xml
	build/test/results/TEST-medrecappx.Service.J_PasienGuiServiceTest.xml
	build/test/results/TEST-medrecappx.Service.K_DokterServiceTest.xml
	build/test/results/TEST-medrecappx.Service.L_DokterGuiServiceTest.xml
	build/test/results/TEST-medrecappx.Service.M_PerawatServiceTest.xml
	build/test/results/TEST-medrecappx.Service.N_PerawatGuiServiceTest.xml
	build/test/results/TEST-medrecappx.Service.O_TindakanServiceTest.xml
	build/test/results/TEST-medrecappx.Service.P_TindakanGuiServiceTest.xml
	dist/MedRecAppX.jar
penambahan Rekam Medis