up1 from gg
Merge branch 'master' of https://github.com/songdukpark3/testgit

Conflicts:
	code.txt

merged in gg