modified css
merge conflicts
Merge branch 'master' of github.com:benloustau/rails_blog