Update
Merge branch 'dimacs_encoding' into commander+msat

Conflicts:
	main.cpp
	parse_hidoku.cpp