Merge remote-tracking branch 'origin/trabajodario' into trabajodiego
frase prueba
Merge remote-tracking branch 'origin/trabajodiego'
prueba
Merge branch 'master' of https://github.com/disla/Blogger
Merge branch 'master' into trabajodario

Conflicts:
	app/views/articles/new.html.erb
prueba3