added code for joining users and subscribed feeders
Merge branch 'master' of https://github.com/umass-cs-326/team-feedme
edits to scenario 4
Merge branch 'master' of https://github.com/umass-cs-326/team-feedme