add note
Merge branch 'master' of
ssh://git@github.com/kbc8894/git_test_kbc894.git

Conflicts:
	test.c
	resolved