Updated server file- twitter.
Last 10 tweets.
finished merge tool from twitter branch