修改标题栏
修改.gitignore
Merge branch 'master' of https://github.com/team4us/Bridge

Conflicts:
	.gitignore