git commit2 mac
Merge branch 'master' of github.com:seojwfan/pubrepo
merge ok

Conflicts:
	pubtest