Added blog
Fixed merge conflicts