fixed merge conflicts
Merge branch 'master' of github.com:mike6838/p10 into Andrea
lots o css
Merge pull request #9 from mike6838/css

Css