Minoir
Merge branch 'master' of https://github.com/ScofieldB/Group4

Conflicts:
	Hospital/Hospital/Reception.Designer.cs