Merge pull request #1 from alchemytaotao/master

合并这个吧
add confilit line for taotao alchemy
merge the conflicts
Merge pull request #2 from taotaoalchemy/master

merge conflict