server
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
imagenes server
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua

Conflicts:
	wp-content/uploads/2014/02/producto-010-1024x1024.jpg
	wp-content/uploads/2014/02/producto-010-150x150.jpg
	wp-content/uploads/2014/02/producto-010-300x300.jpg
	wp-content/uploads/2014/02/producto-010-90x90.jpg
	wp-content/uploads/2014/02/producto-011-1024x1024.jpg
	wp-content/uploads/2014/02/producto-011-150x150.jpg
	wp-content/uploads/2014/02/producto-011-300x300.jpg
	wp-content/uploads/2014/02/producto-011-90x90.jpg
	wp-content/uploads/2014/04/ciudad-1024x1024.jpg
	wp-content/uploads/2014/04/ciudad-150x150.jpg
	wp-content/uploads/2014/04/ciudad-300x300.jpg
	wp-content/uploads/2014/04/ciudad-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-01-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-01-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-01-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-01-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-02-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-02-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-02-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-02-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-021-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-021-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-021-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-021-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-022-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-022-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-022-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-022-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-023-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-023-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-023-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-023-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-03-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-03-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-03-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-03-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-03a-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-03a-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-03a-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-03a-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-03a1-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-03a1-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-03a1-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-03a1-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-04-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-04-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-04-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-04-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-05-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-05-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-05-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-05-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-051-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-051-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-051-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-051-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-052-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-052-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-052-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-052-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-053-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-053-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-053-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-053-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-054-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-054-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-054-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-054-90x90.jpg
	wp-content/uploads/2014/04/imagen-promocional-055-1024x1024.jpg
	wp-content/uploads/2014/04/imagen-promocional-055-150x150.jpg
	wp-content/uploads/2014/04/imagen-promocional-055-300x300.jpg
	wp-content/uploads/2014/04/imagen-promocional-055-90x90.jpg
	wp-content/uploads/2014/06/image-demo-1024x1024.jpg
	wp-content/uploads/2014/06/image-demo-150x150.jpg
	wp-content/uploads/2014/06/image-demo-300x300.jpg
	wp-content/uploads/2014/06/image-demo-90x90.jpg
	wp-content/uploads/2014/06/modello-placeholder11-1024x1024.jpg
	wp-content/uploads/2014/06/modello-placeholder11-150x150.jpg
	wp-content/uploads/2014/06/modello-placeholder11-300x300.jpg
	wp-content/uploads/2014/06/modello-placeholder11-90x90.jpg
	wp-content/uploads/2014/06/producto-001-1024x1024.jpg
	wp-content/uploads/2014/06/producto-001-150x150.jpg
	wp-content/uploads/2014/06/producto-001-300x300.jpg
	wp-content/uploads/2014/06/producto-001-90x90.jpg
	wp-content/uploads/2014/06/producto-002-1024x1024.jpg
	wp-content/uploads/2014/06/producto-002-150x150.jpg
	wp-content/uploads/2014/06/producto-002-300x300.jpg
	wp-content/uploads/2014/06/producto-002-90x90.jpg
	wp-content/uploads/2014/06/producto-003-1024x1024.jpg
	wp-content/uploads/2014/06/producto-003-150x150.jpg
	wp-content/uploads/2014/06/producto-003-300x300.jpg
	wp-content/uploads/2014/06/producto-003-90x90.jpg
	wp-content/uploads/2014/06/producto-004-1024x1024.jpg
	wp-content/uploads/2014/06/producto-004-150x150.jpg
	wp-content/uploads/2014/06/producto-004-300x300.jpg
	wp-content/uploads/2014/06/producto-004-90x90.jpg
	wp-content/uploads/2014/06/producto-005-1024x1024.jpg
	wp-content/uploads/2014/06/producto-005-150x150.jpg
	wp-content/uploads/2014/06/producto-005-300x300.jpg
	wp-content/uploads/2014/06/producto-005-90x90.jpg
	wp-content/uploads/2014/06/producto-006-1024x1024.jpg
	wp-content/uploads/2014/06/producto-006-150x150.jpg
	wp-content/uploads/2014/06/producto-006-300x300.jpg
	wp-content/uploads/2014/06/producto-006-90x90.jpg
	wp-content/uploads/2014/06/producto-007-1024x1024.jpg
	wp-content/uploads/2014/06/producto-007-150x150.jpg
	wp-content/uploads/2014/06/producto-007-300x300.jpg
	wp-content/uploads/2014/06/producto-007-90x90.jpg
	wp-content/uploads/2014/06/producto-008-1024x1024.jpg
	wp-content/uploads/2014/06/producto-008-150x150.jpg
	wp-content/uploads/2014/06/producto-008-300x300.jpg
	wp-content/uploads/2014/06/producto-008-90x90.jpg
	wp-content/uploads/2014/06/producto-009-1024x1024.jpg
	wp-content/uploads/2014/06/producto-009-150x150.jpg
	wp-content/uploads/2014/06/producto-009-300x300.jpg
	wp-content/uploads/2014/06/producto-009-90x90.jpg
	wp-content/uploads/2014/06/producto-012-1024x1024.jpg
	wp-content/uploads/2014/06/producto-012-150x150.jpg
	wp-content/uploads/2014/06/producto-012-300x300.jpg
	wp-content/uploads/2014/06/producto-012-90x90.jpg
	wp-content/uploads/2014/09/background-slider-1024x1024.jpg
	wp-content/uploads/2014/09/background-slider-150x150.jpg
	wp-content/uploads/2014/09/background-slider-300x300.jpg
	wp-content/uploads/2014/09/background-slider-90x90.jpg
	wp-content/uploads/2014/10/001-1024x1024.jpg
	wp-content/uploads/2014/10/001-150x150.jpg
	wp-content/uploads/2014/10/001-300x300.jpg
	wp-content/uploads/2014/10/001-90x90.jpg
	wp-content/uploads/2014/10/002-1024x1024.jpg
	wp-content/uploads/2014/10/002-150x150.jpg
	wp-content/uploads/2014/10/002-300x300.jpg
	wp-content/uploads/2014/10/002-90x90.jpg
	wp-content/uploads/2014/10/003-1024x1024.jpg
	wp-content/uploads/2014/10/003-150x150.jpg
	wp-content/uploads/2014/10/003-300x300.jpg
	wp-content/uploads/2014/10/003-90x90.jpg
	wp-content/uploads/2014/10/004-1024x1024.jpg
	wp-content/uploads/2014/10/004-150x150.jpg
	wp-content/uploads/2014/10/004-300x300.jpg
	wp-content/uploads/2014/10/004-90x90.jpg
	wp-content/uploads/2014/10/005-1024x1024.jpg
	wp-content/uploads/2014/10/005-150x150.jpg
	wp-content/uploads/2014/10/005-300x300.jpg
	wp-content/uploads/2014/10/005-90x90.jpg
	wp-content/uploads/2014/10/006-1024x1024.jpg
	wp-content/uploads/2014/10/006-150x150.jpg
	wp-content/uploads/2014/10/006-300x300.jpg
	wp-content/uploads/2014/10/006-90x90.jpg
	wp-content/uploads/2014/10/007-1024x1024.jpg
	wp-content/uploads/2014/10/007-150x150.jpg
	wp-content/uploads/2014/10/007-300x300.jpg
	wp-content/uploads/2014/10/007-90x90.jpg
	wp-content/uploads/2014/10/brassier-lilipink-1024x1024.jpg
	wp-content/uploads/2014/10/brassier-lilipink-150x150.jpg
	wp-content/uploads/2014/10/brassier-lilipink-300x300.jpg
	wp-content/uploads/2014/10/brassier-lilipink-90x90.jpg
	wp-content/uploads/2014/10/brassier-lilipink1-1024x1024.jpg
	wp-content/uploads/2014/10/brassier-lilipink1-150x150.jpg
	wp-content/uploads/2014/10/brassier-lilipink1-300x300.jpg
	wp-content/uploads/2014/10/brassier-lilipink1-90x90.jpg
	wp-content/uploads/2014/10/brassier-lilipink2-1024x1024.jpg
	wp-content/uploads/2014/10/brassier-lilipink2-150x150.jpg
	wp-content/uploads/2014/10/brassier-lilipink2-300x300.jpg
	wp-content/uploads/2014/10/brassier-lilipink2-90x90.jpg
	wp-content/uploads/2014/10/prueba-1024x1024.jpg
	wp-content/uploads/2014/10/prueba-150x150.jpg
	wp-content/uploads/2014/10/prueba-300x300.jpg
	wp-content/uploads/2014/10/prueba-90x90.jpg
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Servidor gracias a Michel
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua
Merge branch 'master' of https://github.com/MiMartinezcomSAS/lilipinkqua