Merge branch 'corenting'
Option menu. Much swag. Very awesome. Such hackityhack.
Merge branch 'roblabla'
Ajout son bump vers le haut