merge
Merge branch 'master' of github.com:npecheux/notes
optim.tex