adds polling
merge conflicts
Update users_controller.rb
Merge pull request #31 from pocket-gophers-2014/polling

Polling