Removes need for @user
Merge branch 'master' of https://github.com/DiegoGarza/EventFeed