test
.001
test
0.002
git ignore
h
a
0.002
Merge branch 'master' of https://github.com/jaehoonLee/knowledgeShare

Conflicts:
	knowledgeShareDB
connecting BBB
merge conflict solved