ok
ok
ok
ok
Merge branch 'master' of https://github.com/Cernath/DHC2014

Conflicts:
	app/controllers/acceuil_controller.rb
	app/views/acceuil/home.html.haml
ok
ajout vues