main.cpp Signed-off-by: Kim-Sang-A <yasingco@gmail.com>
Merge branch 'master' of github.com:Kim-Sang-A/getTest

Conflicts:
	gitTest.sdf
	main.cpp