对合并的思想实现进行了测试，程序本身暂时没发现问题……
同步工作空间
同步工作空间
save
save
debug问题一致性修改
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DCOPSolver/dfsTree.txt
save
批处理的solve中补加入自己的算法
Merge remote-tracking branch 'upstream/master'

Conflicts:
	DCOPSolver/dfsTree.txt
Merge pull request #6 from heniancheng/master

Merge