update
Merge branch 'master' of github.com:luisgarciar/NLA-1-Script

Conflicts:
	chap2.tex