vuelvo para atras
Revert "mas arreglos (creo jaja)"

This reverts commit b29d44d0f381a5a75d69f62ec80ccfa8253f1781.
Merge branch 'master' of https://github.com/alanszp/dds

Conflicts:
	recital-dominio/src/main/scala/recital/Mayor.scala
Revert "mas arreglos (creo jaja)"

This reverts commit b29d44d0f381a5a75d69f62ec80ccfa8253f1781.

Conflicts:
	recital-dominio/src/main/scala/recital/Mayor.scala