finished 2c
Merge branch 'master' of https://github.com/sophiechang/cs186-asst8

Conflicts:
	sctw-asst8.pdf