First draft of copy for front page. Created basic about page and error page.
fixed merge conflict in nav
Merge branch 'frontpagecontent'

* frontpagecontent:
  First draft of copy for front page. Created basic about page and error page.