Merge branch 'master' of https://github.com/mdidier9/Ping
Merge branch 'master' of https://github.com/mdidier9/Ping
updates tests for phones controller
updated tests
Merge pull request #83 from mdidier9/feature-rsvp-TD

bug fix important:user pinga for creators now persist
Merge pull request #82 from mdidier9/testing-phones

Testing phones
Merge branch 'master' of https://github.com/mdidier9/Ping
uncommenting lines in phonescontroller
Merge pull request #84 from mdidier9/ReHash

Re hash
setup redis locally
Merge pull request #85 from mdidier9/feature-rsvp-TD

Feature rsvp td
redis_options
remove console.log
env changes
back to no options
added rsvp action
Merge pull request #86 from mdidier9/RSVPPhone

added rsvp action
updated phones controller spec
websocket rails config
force heroku