added changes to css
fixed merge conflicts
Merge pull request #10 from krauzer/anthony

Anthony