act
Merge branch 'master' of http://github.com/Adgivi/DAW

Conflicts:
	Prj01/foto 01.jpg
	Prj01/foto 02.jpg
	Prj01/foto 03.jpg
	Prj01/foto 04.jpg
	Prj01/index.php
	Prj01/lightbox/close.gif
	Prj01/lightbox/css/lightbox.css
	Prj01/lightbox/css/overlay.png
	Prj01/lightbox/foto 01.jpg
	Prj01/lightbox/foto 02.jpg
	Prj01/lightbox/foto 03.jpg
	Prj01/lightbox/foto 04.jpg
	Prj01/lightbox/foto 05.jpg
	Prj01/lightbox/foto 06.jpg
	Prj01/lightbox/index.php
	Prj01/lightbox/js/lightbox.js
	Prj01/lightbox/js/loading.gif
	Prj01/tarea 05.php
	Prj01/tarea 06.php
	prj02/cabecera.php
	prj02/cuerpo.php
	prj02/elemento.php
	prj02/img/foto-01.png
	prj02/img/foto-02.png
	prj02/img/foto-03.png
	prj02/img/foto-04.png
	prj02/img/foto-05.png
	prj02/img/foto-06.png
	prj02/index.php
	prj02/pagina.php
	prj02/pie.php
	tarea10/index.php
	tarea11/index.php
	tarea11/layout.php
	tarea13/index.php
	tarea13/layout.php
	tarea14/cabecera.php
	tarea14/cuerpo.php
	tarea14/elemento.php
	tarea14/index.php
	tarea14/pagina.php
	tarea14/pie.php
	tarea15/index.php
	tarea15/reto/ciudades.php
	tarea15/reto/index.php
Merge branch 'master' of http://github.com/Adgivi/DAW
Tarea 18