Video
Casi todo.
Welcome to jekyll
Merge branch 'master' into gh-pages

Conflicts:
	_includes/form.html
	_includes/head.html
	_includes/video.html
	_site/img/bird.jpg
	_site/img/cinque.png
	_site/img/ecocabins.png
	_site/img/lemirage.PNG
	_site/img/lemirage.jpg
	_site/img/sanalfonso.png
	_site/img/spa.png
	_site/img/winery.png
	_site/index.html
	_site/vid/elrio.mp4
	img/bird.jpg
	img/cinque.png
	img/ecocabins.png
	img/lemirage.PNG
	img/lemirage.jpg
	img/sanalfonso.png
	img/spa.png
	img/winery.png
	index.html
	vid/elrio.mp4
Algunos problemas en el merge.
Agregado lista de regalos hecha a mano.
Cambio nombre sitio.
Enchulando parte regalos.
Welcome to jekyll
_site
Merge branch 'gh-pages'