Cambios de fotos que se muestran
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/welcome/index.html.erb
	config/database.yml
	public/Thumbs.db