dev brach
add and char
add char &
change conflict
change bug-01
bug 02
bug 02 merge to master
xxx
add .gitignore