agregado logo de milo
agregados logos de milo
Merge branch 'multiples_paginas' of github.com:dgsalas/milo into multiples_paginas

Conflicts:
	public/stylesheets/style.css
modificados tiempos de mapa
Merge branch 'multiples_paginas' of https://github.com/dgsalas/milo into multiples_paginas