x
Merge branch 'master' of https://github.com/so0602/Concept

Conflicts:
	Somday/Somday.xcodeproj/project.pbxproj
	Somday/Somday/Base.lproj/Main.storyboard
	Somday/Somday/Classes/SDBaseGridView.m
	Somday/Somday/SDHomeViewController.m