fixture arreglado
Merge branch 'iteration-1' of ssh://git@github.com/is-2/SGC.git into iteration-1