save
save
Merge branch 'master' of https://github.com/simpher/DCOPSolver.git

Conflicts:
	DCOPSolver/.temp0.dot
	DCOPSolver/.temp0.dot.gif