Deleted test files, deleted libre office lock file
fixed merge error
Merge branch 'master' of https://github.com/johnnyMick/GL-Projet3-Qping