modified the activity file
Merge branch 'master' of heroku.com:softlife
Merge branch 'master' of heroku.work:softlife