working on css
fixed merge conflicts
change css
Merge pull request #81 from jasonMatney/jason

css  second page changes
Fixed merge conflicts in CSS