Fix merge

Author: Zarux

coffee/react-countdown-clock.coffee

@@ -30,6 +30,10 @@ ReactCountdownClock = CreateReactClass
 
   componentDidMount: ->
     @_seconds = @props.seconds
+    if @props.maxSeconds > 0
+      @_percentOfMax = @_seconds / @props.maxSeconds
+    else
+      @_percentOfMax = 1
     @_setupTimer()
 
   componentWillUnmount: ->
@@ -166,7 +170,7 @@ ReactCountdownClock = CreateReactClass
       @props.fontSize
 
   _drawTimer: ->
-    percent = @_fraction * @_seconds + 1.5
+    percent = @_fraction * @_seconds * @_percentOfMax + 1.5
     formattedTime = @_formattedTime()
     text = if (@props.paused && @props.pausedText?) then @props.pausedText else formattedTime