Merge branch 'master' of https://github.com/ldejonghe/testproject
fifth.txt

testing pull/commit scenarios
added fourth.txt
test
added six.txt
added seven.txt
added a file pulltest.txt for test pulling and pushing
Merge branch 'master' into french