sign in
修改
Merge remote-tracking branch 'astaxie/master'

Conflicts:
	todo.md
Merge pull request #21 from RaymondChou/master

加入翻译
update