implementing Twitter 3-legged oauth: step 2/3
Merge remote-tracking branch 'origin/master'