updated erikas email
copy tweaks and photo creds
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

upstream merge with ryans responsive menu
merged ryans responsive stuff, troubleshooting logo display on ios