added tweet activity
modified the key of the activity
Merge branch 'master' of heroku.work:softlife