Merge branch 'develop' into board
Merge branch 'board' of github.com:wenhuizhao/kecheng into board
make the canvas can draw and input word together