Kate - working on patient dashboard/commiting other pals changes?
Merge branch 'master' of https://github.com/jacqueline27hh/Dryden

Conflicts:
	website/Master/App_Code/ecard.designer.cs