Jackie - bio
Merge branch 'master' of https://github.com/jacqueline27hh/Dryden

Conflicts:
	website/Master/App_Code/ecard.designer.cs
	website/Master/Home.aspx
Jackie - fix the merge conflict