modified:   public/.gitignore
Merge branch 'master' of https://github.com/TJKoury/actionHero

 Trying to fix the tests.
changed test/server_websocket.js again