v3
Merge branch 'master' of https://github.com/kobayashilin/miningLog

Conflicts:
	src/miningLog/Main.java