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