jnq
Merge branch 'master' of https://github.com/sat3/digitalcurrency
Confict fixed