test
test
sample
upView
Merge branch 'master' into LIFEcardtest
lordindicator
Active
keybord
画面遷移
date
date
date
new 912
new 912
Merge branch 'LIFEcardtest' of https://github.com/ShuntaroKubo/LIFE-card into LIFEcardtest

Conflicts:
	LIFE card.xcworkspace/xcshareddata/LIFE card.xccheckout
	LIFE
card.xcworkspace/xcuserdata/shuntarokubo.xcuserdatad/UserInterfaceState.
xcuserstate
	LIFE card/Base.lproj/Main.storyboard
	LIFE card/SwitchViewController.m
	LIFE card/nextViewController.m
	LIFE card/rightSideMenuViewController.h
	LIFE card/rightSideMenuViewController.m
complete1.0
Merge branch 'LIFEcardtest'