commit coba
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/adins/ace/taps/action/LoginAction.java
	ProjectTaps/src/ibatis-cfg.xml
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/adins/ace/taps/action/LoginAction.java
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/adins/ace/taps/action/LoginAction.java
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
ubah ibatis config ke db lukas
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/adins/ace/taps/action/LoginAction.java
	ProjectTaps/src/ibatis-cfg.xml

	nambahin update by sewaktu delete employee
nambahin update by and update date di employee
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/ibatis-cfg.xml
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/ibatis-cfg.xml
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
bandingin value string lebih baik pakai equals, jika ingin bandingin
value dan alamat memory dari string pakai ==
nyoba benerin department edit
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/adins/ace/taps/action/OrganizationAction.java
jangan dihiraukan.. ini aku coba hapus sesuatu
edit project jsp, kalo status project close maka cuma bisa view only
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git

Conflicts:
	ProjectTaps/src/adins/ace/taps/action/LoginAction.java
	ProjectTaps/src/ibatis-cfg.xml