Partial change...not sure
Merge branch 'Jason' of https://github.com/geekygirlsarah/cs470project into Jason

Conflicts:
	CS470Project/CS470Project.vbproj
	CS470Project/Patient.vb