replaced express and socket io with express.io
stream tweets to right clients
added angular js
added stream json
fixed merge conflict