mon deuxième commit test
Merge branch 'master' of https://github.com/GuillaumeJJ/FirstWorkshop

Conflicts:
	app/views/home/index.html.erb