more changes
Merge branch 'master' of https://github.com/person594/cs156

Conflicts:
	hw3/csp_solver.py