df

dfs
Merge branch 'master' of https://github.com/niufuwei/newEliuyan

Conflicts:
	EliuYan/EliuYan.xcodeproj/project.pbxproj
	EliuYan/EliuYan/MainVC/ShoppingVC/MenuViewController.m