注释
Merge branch 'refs/heads/master' of https://github.com/baoyi/Launcher2-Standalone.git
合并冲突，添加注释