Cambios

Varios cambios
Merge branch 'master' of https://github.com/quiqueciria/tipomanzine

Conflicts:
	README.md