Adding override and stuff.
Merge branch 'master' of https://github.com/NinjaTrappeur/Projet-tutor-