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

Conflicts:
	src/main/scala/actions/RawBlockFileReaderUncompressed.scala