added pure css
fixed merge conflict
style tweaks
Merge pull request #10 from apesic/style

Style