changes
Merge branch 'master' of github.com:ceguster/shindig-it
Merge branch 'master' of github.com:ceguster/shindig-it
added method to test api
Merge branch 'Brianne'
added yummly gem
Set user method in UsersController& changed users#show accordingly, made links to event#index and event#show on user#show