descaraga accidente
descarga-Novedades
Merge pull request #14 from WilliamRojas/master

ajustes de accidente
Merge pull request #15 from lindalizeth/master

descarga-Novedades
merg
Merge branch 'master' of https://github.com/morenopalacios/PROYECTO

Conflicts:
	public/system/albums/images/000/000/003/medium/4.png
	public/system/albums/images/000/000/003/thumb/4.png
modificacion de use
cambios de css
Merge branch 'master' of https://github.com/morenopalacios/PROYECTO
Merge https://github.com/morenopalacios/PROYECTO

Conflicts:
	app/assets/stylesheets/bootstrap.css
a