다시 전체 커밋합니다.
Merge branch 'UI_work' of https://github.com/jaecheolkim/Pixbee into UI_work

Conflicts:
	Pixbee.xcodeproj/project.pbxproj
	Pixbee/Base.lproj/Main.storyboard