i've done my best...
Merge branch 'master' of https://github.com/huzhangyang/musicgame.git
change back to bmfont.
Merge branch 'master' of https://github.com/huzhangyang/musicgame.git
Merge branch 'master' of https://github.com/huzhangyang/musicgame.git