Merge origin/master

Conflicts:
	src/sudoku260/AverageScore.java