edited blog template, html and css
fixed merge conflicts in html and css files