started hw6
continued hw6
Merge branch 'origin/master'

Conflicts:
	Homework6/CS266_hw6.pdf
	Homework6/CS266_hw6.tex
started hw7