pour faire plaisir a julien
bieutifull commit
Merge branch 'master' of github.com:matttbe/SIT

Conflicts:
	website/Solidare-IT-g6/app/controllers/organisations_controller.rb
	website/Solidare-IT-g6/app/views/organisations/index.html.erb