lalala
Merge branch 'master' of github.com:carlos-echeverria/NLA-1-handouts

Conflicts:
	homework1.tex
Merge branch 'master' of github.com:carlos-echeverria/NLA-1-handouts
fixed merge conflict