added twitter stream
merged