estabilizacion del codigo
Merge branch 'master' of https://github.com/fvenegasp/rondin

Conflicts:
	.gitignore