added screenshot cuz aman couldn't do it
Merge branch 'master' of https://github.com/TheoT/twitter_sprint
merged conflicts