Adding Contact page.
Merge branches 'master' and 'contact-branch'