master / bringing

Conflicts:
	test_2.php
sb / 고고고
Merge remote-tracking branch 'remotes/origin/sb'

Conflicts:
	test_2.php
sb /ㅇㅇㅇㅇㅇㅇㅇ
test1
Merge branch 'sb' of https://github.com/seongbeomkim/test

Conflicts:
	test_2.php