::asd
Merge branch 'master' of https://github.com/theassman/investigacion

Conflicts:
	src/solucion.sol
asd