Fixing things
Merge branch 'master' of https://github.com/syhc/Giberson-et-al.

Conflicts:
	MedicalInformationManagementSystem/App.config
	MedicalInformationManagementSystem/Properties/Settings.Designer.cs
	MedicalInformationManagementSystem/Properties/Settings.settings