asd
Merge branch 'master' of https://github.com/yale89/Repositorio_Ayde

Conflicts:
	GestionHoras.cpp