created homework2
created homework2 again
Merge remote-tracking branch 'origin/master'

Conflicts:
	homework1.tex