Fixed outstanding problems with Hospital class, implemented
dischargePatient() and created JavaDoc comments for the Hospital class
Merge remote-tracking branch 'origin/master'

Conflicts:
	ECSHospital/src/Hospital.java
	ECSHospital/src/TestHarness.java
	ECSHospital/src/Theatre.java