Pop_up de maestros

Pop_up de maestros
Merge branch 'master' of https://github.com/JavierLob/Martin