Merging.
Merge origin/master

Conflicts:
	src/sudoku/solver/SudokuSolver.java