bugs whyyy
Merge branch 'master' into cross

Conflicts:
	Puzzle.cpp
bug fixed.
Merge branch 'cross' of https://github.com/cpalone/csolve into cross