merge
Merge branch 'master' of github.com:K0414/btcchina.py
add robot