for ok
Merge branch 'master' of https://github.com/yfjelley/alyun

Conflicts:
	coin.py