grid view added
Merge branch 'master' of https://github.com/Jehyeok/iOS_phonecasePrincess

Conflicts:
	iOS_phonecasePrincess/iOS_phonecasePrincess.xcodeproj/project.pbxproj
	iOS_phonecasePrincess/iOS_phonecasePrincess/AppDelegate.m