add contact page
Merge branch 'master' into ghpages