Cambios Justificar
Merge branch 'master' of https://github.com/HoracioEC/PaginaToro

Conflicts:
	bootstrap/img/slide-01.jpg
	bootstrap/img/slide-02.jpg