with everyone in the feed
Merge branch 'master' of github.com:Carlyalexandra/nomadder
merged with jason