maj

maj+makefile
Merge branch 'work' of https://github.com/Lordrak/Projet-c into work