small fix
Merge branch 'master' into bit_sudoku

Conflicts:
	sudoku.hpp