Merge pull request #8 from buzzlightyear182/fix-tweets

Fix tweets
part of the box of ourtweets, and when you click in name the pop up of the mark appear, this part is not complet it
Fixed merge conflicts