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

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

Conflicts:
	miner.cpp