trying to make pusher do something cool
fixed merge conflcits in main.js
made pusher work, sort of
fixed merge conflicts