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

Conflicts:
	hw2/crazy_eights.pyc