Anuncios versión incompleta

grr
Merge branches 'MarthaH', 'master' and 'master' of https://github.com/fraleiz17/qup