Added author's posts page
Fixed merge conflict