conversion takes place
Merge branch 'master' of https://github.com/maccam912/btc2merchant