j
Merge branch 'master' of https://github.com/recuentoegc/recuento.git

Conflicts:
	src/main/java/algoritmos/Algoritmo.java
Merge branch 'master' of https://github.com/recuentoegc/recuento.git

Conflicts:
	src/main/java/algoritmos/Algoritmo.java