Fix inconsistencies between files2
Merge branch 'master' of ssh://github.com/GraspSilv/1943project