test result update
Sync for presentation
Merge branch 'master' of https://github.com/ScofieldB/Group4

Conflicts:
	Hospital/Hospital/DBCon.cs