changed package.json
Merge branch 'master' of https://github.com/bucifer/node-realtime-twitter

Conflicts:
	package.json