correction + ajout
Merge branch 'master' of https://github.com/Vulkan13/42