Merge branch 'master' of https://github.com/tekken1234/RecipeStore88 int...

...o master1

Conflicts:
	.DS_Store

RecipeStore88.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad
/UserInterfaceState.xcuserstate