toto
Merge branch 'master' of https://github.com/ClubEngine/nuitdelinfo

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