Merge branch 'master', remote-tracking branch 'origin'
4.txt and 5.txt not needed anymore