contact info
Add contacts
Merge branch 'master' into gh-pages