refactored proxy / added ping
Merge pull request #5 from mozilla/proxy

refactored proxy / added ping