Merge pull request #1 from fankobebryant/develop

wangfan wants to commit requests
wangfan I commit pre project here
Merge branch 'develop' of https://github.com/wanggang198810/GF-Notepad into develop

# By fankobebryant
# Via fankobebryant (1) and wanggang198810 (1)
* 'develop' of https://github.com/wanggang198810/GF-Notepad:
  asgd
nothing
Merge pull request #1 from wanggang198810/master

合并刚哥的更新