Mega commit inicial
Merge branch 'master' of https://github.com/smaass/Tarea2-algoritmos

Conflicts:
	.gitignore