Update Notes.tex
Merge branch 'master' of https://github.com/marcof80/Notes

Conflicts:
	Notes.tex