translated to french
test editor
added third.txt
Merge branch 'master' of https://github.com/ldejonghe/testproject into french
Merge branch 'master' into french
Merge branch 'master' into french
added a fouth line forpulltext while in french branch
added a fouth line as well in master branch
resolved conflict on pulltext.txt