test github
expand short url and shorten an url in sina weibo
remove extra line from conflict msg..
expand and short an url (short is just for sina)
add renren and tencent short url UT
add imports
1) deal with invalid URL 2) format: tab -> blanks
Merge branch 'master' into dev
add contributor
snsapi: add Tkinter GUI
Merge branch 'doc' of https://github.com/uestcmy/snsapi into doc
upgrade docstring : changed sina.py
changed the file in the folder
upgrade docstring : changed renren.py
upgrade docstring : changed rss.py
upgrade docstring : changed rss.py
Merge remote-tracking branch 'origin/master' into doc
Merge branch 'doc' of git://github.com/uestcmy/snsapi into uestcmy-doc
Revert "upgrade docstring : changed renren.py"

This reverts commit 1a23541e2fbbf6a2c0a3d3dde1d3fdda375d9db7.
fix typos