added twitter streaming
fixed merge conflict