testing for Asheen <Bandile>
deleted build folder <Bandile>
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/web/Admin.jsp
	Integrated Project/Gauteng MMS/build/web/BodyFileTabContent.jsp
	Integrated Project/Gauteng MMS/build/web/Home.jsp
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/src/java/database/BodyDb.java
merging issues commented out on BodyDb
<Bandile>