added contact us to about page
fixed merge conflicts
Merge branch 'master' of https://github.com/jennifercmaurer/IUGA-website