19/10/2014 Creacion de Promociones
Merge branch 'master' of https://github.com/Roberts93/Gym_JOU