Last changes

Head <<<<<< and some comments of Git