1
merge
Dividing the run/test entrances into two parts
slice modify
Merge remote-tracking branch 'origin/master'

Conflicts:
	bugzillaMiner/miner/minerMain.py