Añadida frase

frase añadida
amarillo!!
borro new

si
New article New!!
Revert "New article New!!"

This reverts commit 9e6d85024d288a7488c99eec3a55cce7dbc468e7.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into Dario

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