added search
removed duplicate search file
added comments
changed the way activity_id is passed in on a new comment
removed new.html.haml
fixed conflict in seeds