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

Conflicts:
	Somday/Somday/Base.lproj/Main.storyboard
q
Merge branch 'master' of https://github.com/so0602/Concept