修改
Merge branch 'master' of github.com:03131302/SinaApi

Conflicts:
	lib/main.rb