Added search and updated_at functionality
resolved conflicts
Resolved additional conflict in post.rb