Fixed blog stuff
fixed merge conflicts
modified comment page and styles