On corrige le merge branch foireux de nico
Merge branch 'master' of https://github.com/Wafflewrath/lo18_utsh