version 3.0
nueva version
intentando solucionar
Merge branch 'master' of https://github.com/unzero/discretas

Conflicts:
	Book.pdf
nueva version