New dir testingFolder and new line in testFile
Merge branch 'testing2'