some errors
erorrs
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git

Conflicts:
	Integrated Project/Gauteng MMS/build/generated/classes/org/apache/jsp/Admin_jsp.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/BodyAtSceneDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/database/BodyDb.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/classes/servlets/Tools.class
	Integrated Project/Gauteng MMS/build/web/WEB-INF/web.xml
	Integrated Project/Gauteng MMS/nbproject/genfiles.properties
	Integrated Project/Gauteng MMS/nbproject/private/private.properties
	Integrated Project/Gauteng MMS/src/java/servlets/AtSceneServlet.java
	Integrated Project/Gauteng MMS/src/java/servlets/Tools.java
	Integrated Project/Gauteng MMS/web/WEB-INF/web.xml
updated
Merge branch 'master' of git@github.com:CoachLab2013/MMS.git
Done with edit the delete