chris
Merge branch 'master' of https://github.com/Jehyeok/iOS_phonecasePrincess

Conflicts:
	iOS_phonecasePrincess/.DS_Store
options nib apply