创建项目
Merge branch 'master' of github.com:changweihua/ShinePhoto

Conflicts:
	.gitignore