프로젝트 커밋 취
Merge branch 'master' of https://github.com/jaecheolkim/Pixbee2

Conflicts:
	Pixbee.xcodeproj/project.pbxproj