merged with gh-pages
resloved merging issues
Merge branch 'master' into gh-pages
fixing merge
changed links
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
additional changes
merging with master
Additional changes to conformwith mattCSS.css
 Changed color of text boxes, added headshot, changed footer
Merge branch 'master' into Matthew
Fixed radio buttons
merged with master
Merge branch 'Matthew' into gh-pages
final draft
Merge pull request #14 from CrouseMatthew/Matthew

Matthew
Merge pull request #15 from CrouseMatthew/estes

contacts final
more changes to conform