main ui
Merge branch 'master' of github.com:shuaqiu/yuanyuanxibo

Conflicts:
	.gitignore