Merge branch 'master' of https://github.com/junsup/cs-182-jun-tim

Conflicts:
	sudoku/pset3.py
Merge branch 'master' of https://github.com/junsup/cs-182-jun-tim