pull error 해결하려
Merge branch 'master' of https://github.com/SunjaePark/RandomLunch

Conflicts:
	RandomLunch/AppDelegate.m