fixed welcome email
Mark added bio
fix merge conflict in about.html.erb