Agregada pista 12
Merge remote-tracking branch 'origin/master'

Conflicts:
	AlgoritmosGeneticos/AlgoritmosGeneticos.csproj