Merge branch '28-controller-tests' into Development

app/controllers/habits_controller.rb

@@ -76,15 +76,12 @@ class HabitsController < ApplicationController
         format.html { redirect_to :root, notice: 'You have already done that today. Come back tomorrow!'  }
       end
     end
-<<<<<<< HEAD
+    
     if @habit.max_streak.nil?
       @habit.max_streak = @habit.streak
       @habit.save
     elsif @habit.streak > @habit.max_streak
-=======
 
-    if @habit.max_streak.nil? || @habit.streak > @habit.max_streak
->>>>>>> 28-controller-tests
       @habit.max_streak = @habit.streak
       @habit.save
     end