Merge conflicts fixed

Author: kreonjr

WhatToEat.xcodeproj/project.xcworkspace/xcuserdata/Kreon.xcuserdatad/UserInterfaceState.xcuserstate

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+</Bucket>

WhatToEat.xcodeproj/xcuserdata/Kreon.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -165,8 +165,7 @@ -(void)timerRun{
 
 //Initialization of a timer object that calls the timerRun method
 - (void)setTimer{
-    
-    timer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(timerRun) userInfo:nil repeats:YES];
+        timer = [NSTimer scheduledTimerWithTimeInterval:1.0 target:self selector:@selector(timerRun) userInfo:nil repeats:YES];
 }
 
 
@@ -181,7 +180,7 @@ - (IBAction)CloseTimer:(id)sender {
     //Enable the start timer
     OpenTimerButton.enabled = TRUE;
     //Reset the title of the stop timer button
-    CloseTimerButton.title = @"Close Timer";
+    CloseTimerButton.title = @"";
 
 
 
@@ -191,6 +190,7 @@ - (IBAction)CloseTimer:(id)sender {
 - (IBAction)OpenTimer:(id)sender {
 
     PickerContainerView.hidden=FALSE;
+    CloseTimerButton.title = @"Close Timer";
 
 }
 
@@ -293,9 +293,9 @@ - (IBAction)AddFavorite:(id)sender {
 }
 
 - (IBAction)StartTimer:(id)sender {
-    [self setTimer];
-    CloseTimerButton.title = @"Close Timer";
-    PickerContainerView.hidden=TRUE;
+            [self setTimer];
+            CloseTimerButton.title = @"Stop Timer";
+            PickerContainerView.hidden=TRUE;
 }
 
 

WhatToEat/RecipeDetailViewController.m

@@ -497,7 +497,7 @@
                             </connections>
                         </barButtonItem>
                         <barButtonItem style="plain" systemItem="flexibleSpace" id="0E3-23-T5b"/>
-                        <barButtonItem title="Close Timer" id="pRx-Ay-7eK">
+                        <barButtonItem id="pRx-Ay-7eK">
                             <connections>
                                 <action selector="CloseTimer:" destination="SRM-zH-9uP" id="5by-g1-cmG"/>
                             </connections>