Agregar titulo en articulos
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/app/views/articles/index.html.erb