updated token
Merge branch 'master' of https://github.com/hugozhu/weibo2twitter

Conflicts:
	src/twitter.go
added back