ganbareore
Merge branch 'master' of https://github.com/yoshimasa1700/HFMD_evaluate

Conflicts:
	HFMD_evaluation.creator.user
	config.xml~
	trees/treetable002.txt
	trees/treetable002_timeResult.txt
	trees/treetable003.txt
	trees/treetable003_timeResult.txt
	trees/treetable004.txt
	trees/treetable004_timeResult.txt
	trees/treetable005.txt
	trees/treetable005_timeResult.txt
	trees/treetable006.txt
	trees/treetable006_timeResult.txt
	trees/treetable007.txt
	trees/treetable007_timeResult.txt
	trees/treetable008.txt
	trees/treetable008_timeResult.txt
	trees/treetable009.txt
	trees/treetable009_timeResult.txt
	trees/treetable010.txt
	trees/treetable010_timeResult.txt
	trees/treetable011.txt
	trees/treetable011_timeResult.txt
	trees/treetable012.txt
	trees/treetable012_timeResult.txt
	trees/treetable013.txt
	trees/treetable013_timeResult.txt
	trees/treetable014.txt
	trees/treetable014_timeResult.txt
	trees/treetable015.txt
	trees/treetable015_timeResult.txt
	trees/treetable016.txt
	trees/treetable016_timeResult.txt
	trees/treetable017.txt
	trees/treetable017_timeResult.txt
	trees/treetable018.txt
	trees/treetable018_timeResult.txt
	trees/treetable019.txt
	trees/treetable019_timeResult.txt
	trees/treetableclassDatabase002.txt
	trees/treetableclassDatabase004.txt
	trees/treetableclassDatabase006.txt
	trees/treetableclassDatabase008.txt
	trees/treetableclassDatabase009.txt
	trees/treetableclassDatabase010.txt
	trees/treetableclassDatabase013.txt
	trees/treetableclassDatabase014.txt
	trees/treetableclassDatabase015.txt
	trees/treetableclassDatabase016.txt
	trees/treetableclassDatabase017.txt
	trees/treetableclassDatabase018.txt
	trees/treetableclassDatabase019.txt