Revert "My second commit"

This reverts commit 22d105d81aabcf3c38ab466f1b55c01da105cec7.
Merge remote-tracking branch 'origin/master'

Conflicts:
	test_file1.txt
Revert "Revert "My second commit""

This reverts commit f886f4958cde24a42267ffdbb5035fab7c33ebc2.

Conflicts:
	test_file1.txt