Avancement
FixMerge branch 'master' of github.com:Steingate/noel-buzz

Conflicts:
	app/views/cadeaux/index.blade.php
Merge branch 'master' of github.com:Steingate/noel-buzz

Conflicts:
	app/views/cadeaux/index.blade.php