added timestamp to each tweet
fixed merge conflict