half tests
Merge branch 'master' into mine
implemented getDisplayTweets to show all tweets that will be on the display
implemented getDisplayTweets to show all tweets that will be on the display