Signed-off-by: Yingzhi Lin <YingzhiLin@robotao.com>
hhh
recommit
a daughter
Add a new files.
rename conf to bin
to branch.
add sources.
add lines.
add new file
fds
mv dev.conf to dev2.conf
Merge branch 'YingzhiLin-Home'

Conflicts:
	conf/dev2.conf
Merge branch 'YingzhiLin-Home'
Success repair the bug 101.
add file conf/start.txt
Merge branch 'dev'
add log files.
repair bug 102 at file hello.txt
add a new log file.