commit prueba
Merge branch 'master' of http://github.com/VIFA/mag