change second
Merge branch 'master' of https://github.com/nantank/Test

Conflicts:
	ConflictFile.txt