Merge branch 'interactionTests'

Updated ViewController.xib to connect downAmber and downGreen correcrlt
Merge branch 'workingLights'