Merge branch 'master' of https://github.com/chonghwashao/git_test.git

Conflicts:
	NewFile.txt
Merge branch 'master' of https://github.com/chonghwashao/git_test.git