before theme
muchos cambios
final 27-12
Merge branch 'newtheme'