added socket.io however doesnt work yet
Merge branch 'master' of https://github.com/Ingelheim/TweetDash

Conflicts:
	server.js
ignore node_modules
Merge branch 'master' of github.com:Ingelheim/TweetDash

Conflicts:
	server.js