Commit changes

to check sync conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Test1.txt