Merge branch 'master' of https://github.com/philuu265/testgit

Conflicts:
	New Text Document.txt
Merge branch 'master' of https://github.com/philuu265/testgit

Conflicts:
	New Text Document.txt