-Cambios de Kari en el rest
Merge branch 'master' of https://github.com/klanata/SSAC