hg
Merge branch 'master' of github.com:Kim-Sang-A/getTest

Conflicts:
	gitTest.sdf