更新
解决冲突

Conflicts:
	TheStoreApp/Controllers/YWHomeViewController.h
Merge branch 'master' of https://github.com/yeliang001/TheStoreApp

Conflicts:
	TheStoreApp/Controllers/YWHomeViewController.m