Merge branch 'master' of https://github.com/hhhgtr00055/SpecTemplateMiner

Conflicts:
	miner.cpp
	miner.h
Merge branch 'master' of https://github.com/hhhgtr00055/SpecTemplateMiner

Conflicts:
	miner.cpp