commit for sync
Merge remote-tracking branch 'origin/master'

Conflicts:
	Sudoku.java
Merge branch 'master' of https://github.com/olson57/proj04-Sudoku

Conflicts:
	Sudoku.java
Merge branch 'master' of https://github.com/olson57/proj04-Sudoku

Conflicts:
	Sudoku.java
Merge branch 'mfix