primera subida
segunda subida
subida con la solucion content_controller.rb article.rb _artile_merge.html.erb _edit.html.erb merge_article.feature merge_steps.rb paths.rb