詳細画面をがんばった
Merge branch 'master' of https://github.com/shinno21/iOshinavi

Conflicts:
	PushUpDetailViewController.h
	PushUpDetailViewController.m
	PushUpDtlViewController.h
	PushUpDtlViewController.m
	iOshinavi.xcodeproj/project.pbxproj

iOshinavi.xcodeproj/project.xcworkspace/xcuserdata/habashin.xcuserdatad/
UserInterfaceState.xcuserstate

iOshinavi.xcodeproj/xcuserdata/habashin.xcuserdatad/xcschemes/iOshinavi.
xcscheme

iOshinavi.xcodeproj/xcuserdata/habashin.xcuserdatad/xcschemes/xcschemema
nagement.plist
	iOshinavi/PushUpListViewController.m
	iOshinavi/en.lproj/MainStoryboard_iPhone.storyboard
	shopdata.json