Local changes
Merge branch 'master' of https://github.com/stefanwouldgo/Bitcoin-Graph-Explorer

Conflicts:
	build.sbt
	src/main/scala/core/BlockReader.scala