fixing merge issues in post controller
fixing merge issues with posts view, post view spec, post controller, post controller spec