galère liaison
Merge branch 'master' of https://github.com/DimitriHeloin/Stoo

Conflicts:
	Gemfile
	Gemfile.lock
	db/schema.rb
fin