주석
pull 충돌 해결
Merge branch 'master' of https://github.com/jipsoft1/GitTest2

Conflicts:
	gittestclass.cpp