update
update
pull from master
add required combo
some script
Merge branch 'master' into algorithm

Conflicts:
	Solver/src/stimim/solver/Solver.java