I am First File
Update MyText.txt
Test
Merge branch 'master' of https://github.com/chenkidy/MyGitClass

Conflicts:
	MyText.txt
add
Merge branch 'master' of https://github.com/chenkidy/Git-P2