adding file16.txt on feature branch
adding file17.txt on  master
Merge branch 'master' into featureG
adding file19.txt on  master
adding file18.txt on feature branch
changing file17.txt
Merge branch 'master' of https://github.com/tcarlier/hellogitworld