odstranenie konfliktu
Merge branch 'refs/heads/master' of https://github.com/fancystudio/bitcoin.git