26 sep
Clase 26sept
Merge branch 'master' of https://github.com/CecliaGimeno/AD

Conflicts:
	PHolaMySql/PHolaMySql.userprefs