ShopViewControllerを作って接続した直後
Merge branch 'master' of github.com:kissykazuya/MS

Conflicts:
	FHRS.xcodeproj/project.pbxproj
	FHRS/Match/InviteViewController.xib
	FHRS/Match/MatchViewController.xib