commit gordo
Merge branch 'master' of https://github.com/lvalenzuela/starting-project

Conflicts: hola
	app/assets/images/computer_images/Acer/M5-481PT/Thumbs.db
Merge branch 'master' of https://github.com/lvalenzuela/starting-project
Merge branch 'master' of https://github.com/lvalenzuela/starting-project
Merge branch 'master' of https://github.com/lvalenzuela/starting-project
Merge branch 'master' of https://github.com/lvalenzuela/starting-project
imagenes y cositas