into to blockchain and blocks
Merge branch 'chapter/Chapter6' into develop