nada
Merge branch 'master' of https://github.com/destroyer-1990/proyectotonejo

Conflicts:
	cgi/authMod.c
	cgi/authMod.cgi

nada
Merge branch 'master' of https://github.com/destroyer-1990/proyectotonejo