Gui测试
update .gitgnore
Merge remote branch 'origin/master' into Gui