Merge branch 'test'
Updating twitter logo
Merge branch 'master' into test