switching branch
Merge remote-tracking branch 'upstream/master'
ran most recent migrate
fixed nav bar link to contact page
Merge pull request #95 from jschiang/master

fixed nav bar link for contact us