GitHub Test
Merge branch 'master' of https://github.com/gnefjp/TestGitProject

Conflicts:
	TestDir/main.cpp