bingung
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
asd
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
Merge branch 'master' of https://github.com/asemsao/ProjectTAPS.git
asd
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

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

Conflicts:
	ProjectTaps/src/ibatis-cfg.xml