changes
Merge https://github.com/LDreptate/test
Merge https://github.com/LDreptate/test
Merge https://github.com/LDreptate/test

Conflicts:
	newFolder/aaa.txt