c
Merge branch 'master' of
https://github.com/XiaoEDaiKuan/xiao-e-dai-kuan-site-app.git

Conflicts:
	.settings/org.eclipse.core.resources.prefs