a
Merge branch 'master' of https://github.com/kwgoon/hospital

Conflicts:
	hospital/src/main/java/conf/medicalRecord.xml