Relay with timer and separate switch for light

[dougp]

I wouldn't disturb the timer code, just add a logical OR condition to the part where the (digital.write?) light is controlled.

if(timerDone || switchOn) // turn light on