colors and nav bar changed
second commit
Merge branch 'master' into david
Merge pull request #1 from GerryFudd/master

Bringing in Alan's changes
Changes to Header
trying to do anything
Revert "trying to do anything"

This reverts commit 679f275bf4c50daa804a142d67fd8237c6a211c3.
Merge branch 'master' into david
Resolving some differences

I changed a couple of things after pulling Alan's changes from last Saturday and Rhonda's from this morning.
 - I changed the headshot to be its own class.  Now all objects in the headshot class have width 90%
 - I copied the code from the header and nav bar so that they are the same on all pages
 - I combined the two places in the template.css folder that styled the h1 header and changed it to a fancy_heading class
 - There is now only one h1 object on each page and that object states what the page is.