added new class
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
made changes to kin.
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
Added the design of the ICD10 database tables
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/EditUser.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/nbproject/genfiles.properties
	Integrated Project/Gauteng MMS/nbproject/private/private.properties