Don't you love git GUI's? They don't upload your stuff to GitHub!
Merge remote-tracking branch 'origin/master'