Tonterías del Git ya subidas
Merge branch 'master' of https://github.com/IESMonterroso/intranet

Conflicts:
	faltas/poner2/borrar.php