搭建
Merge branch 'master' of https://github.com/lxj5891/jEyes

Conflicts:
	.gitignore