activity basic not done yet
activity basic not done yet
fixed merge conflict in schema.rb
created activity and modified newsfeed to display different feedable contents