Merge branch 'master' of https://github.com/eeeeek-da-cat/CoinexAPP

Conflicts:
	README.md