merge conflict resolution
retweet icon changes form blue to green with retwat
Merge pull request #51 from wvmitchell/tweet_display

Tweet display