Initial commit
correction lien profile new dans nav
Ok
Merge branch 'before_save ' , résolution manuelle des conflits

Conflicts:
	app/controllers/articles_controller.rb
	app/models/article.rb
	app/views/articles/index.html.erb
	app/views/layouts/_nav.html.erb
	db/development.sqlite3
	log/development.log
	tmp/pids/server.pid
 Nettoyage post merge