diff --git a/test-wsplay/ws.rb b/test-wsplay/ws.rb
index 170b332..452bace 100755
--- a/test-wsplay/ws.rb
+++ b/test-wsplay/ws.rb
@@ -10,16 +10,18 @@
 ans = {}
 readiness = {}
 
-<<<<<<< HEAD
-@musiclist = ["UFO.mp3"]
-=======
-@musiclist = CSV.read("music.csv", :headers=>true)
->>>>>>> cf891c544eeca563d1b75fdc33107a9a3a55512d
+#<<<<<<< HEAD
+#@musiclist = ["UFO.mp3"]
+#=======
+@musiclist = CSV.read("../public/audio/music.csv", :headers=>true)
+#>>>>>>> cf891c544eeca563d1b75fdc33107a9a3a55512d
 @musicpos  = 0
 @rediness  = {}
 @admin = nil
 @stoptime = nil
 
+p @musiclist[0]
+
 print("No clients yet...")
 EM::WebSocket.start({:host => "0.0.0.0", :port => PORT}) do |ws_conn|
   ws_conn.onopen do