worked on hw1
finished hw1
Merge remote-tracking branch 'origin/master'

Conflicts:
	HW1.log
	HW1.pdf
	HW1.tex