Merge branch 'master' of https://github.com/rayhogenson/bridge

Conflicts:
	ShowRunner.py

1 files changed, 2 insertions, 0 deletions

diff --git a/ShowRunner.py b/ShowRunner.py
index 1ec1c87..61c0cf6 100644
--- a/ShowRunner.py
+++ b/ShowRunner.py
@@ -1,6 +1,7 @@
 from bridge import Bridge
 from fish_show import FishShow
 from sunrise import SunriseShow
+from twinkle import TwinkleShow
 from constants import *
 
 import sys
@@ -10,6 +11,7 @@ from run import server_thread, send_queue, recv_queue
 def run_show():
     server_thread.start()
     bridge = Bridge()
+    TwinkleShow(bridge, send_queue=recv_queue, recv_queue=send_queue).run(framerate=FRAME_RATE)
     SunriseShow(bridge, send_queue=recv_queue, recv_queue=send_queue).run(framerate=FRAME_RATE)
     FishShow(bridge, send_queue=recv_queue, recv_queue=send_queue).run(framerate=FRAME_RATE)
     print "done!"