From 9031a8ae0941231a788a6e63fdb88264ba40e1e7 Mon Sep 17 00:00:00 2001
From: Alberto Godinez <alberto.godinez90@gmail.com>
Date: Wed, 15 Mar 2017 11:18:30 -0500
Subject: [PATCH 01/12] added stuff to index

---
 index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/index.html b/index.html
index 37cf706..41cba2e 100644
--- a/index.html
+++ b/index.html
@@ -77,6 +77,7 @@ <h1>Get Started!</h1>
       },
       message: function(message) {
         console.log(message);
+        $("#musicTable ul").append('<li>message</li>');
           // handle message
       },
       presence: function(presenceEvent) {

From 5ed1b4f9bb87910b8184b1ebfa82cb4cf58fa7d6 Mon Sep 17 00:00:00 2001
From: Alberto Godinez <alberto.godinez90@gmail.com>
Date: Wed, 15 Mar 2017 11:39:13 -0500
Subject: [PATCH 02/12] credit writer

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 41cba2e..6780100 100644
--- a/index.html
+++ b/index.html
@@ -54,7 +54,7 @@
   </header>
 
   <section id="home" class="sec-main">
-    <h1 class="main-heading">Credit Writers</h1>          
+    <h1 class="main-heading">Credit Writer</h1>          
 </div>
   </section>
 

From 882ca15c5c4889d6071014e77613add595012d5e Mon Sep 17 00:00:00 2001
From: Alberto Godinez <alberto.godinez90@gmail.com>
Date: Wed, 15 Mar 2017 11:44:02 -0500
Subject: [PATCH 03/12] added ul

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 6780100..629a506 100644
--- a/index.html
+++ b/index.html
@@ -250,7 +250,7 @@ <h1>Get Started!</h1>
         <input id="input" type="submit" name="submit" value="SEARCH" />
       </form>
 
-    <div id="musicTable"></div>
+      <div id="musicTable"><ul></ul></div>
 
   </section>
   

From a68fb451fd2924c5f67d4ad9dbf84ed743424116 Mon Sep 17 00:00:00 2001
From: Alberto Godinez <alberto.godinez90@gmail.com>
Date: Wed, 15 Mar 2017 11:53:12 -0500
Subject: [PATCH 04/12] updated

---
 index.html | 48 +++++++-----------------------------------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/index.html b/index.html
index 629a506..3eae1cc 100644
--- a/index.html
+++ b/index.html
@@ -64,14 +64,10 @@ <h1 class="main-heading">Credit Writer</h1>
     <h1>Get Started!</h1>
 
     <script>
-
 function getInfo(){
   var pubnub = new PubNub({
         subscribeKey : 'sub-c-0a7113d8-095b-11e7-b09b-0619f8945a4f'
-  })
-
-
-
+  });
   pubnub.addListener({
       status: function(statusEvent) {
       },
@@ -83,22 +79,22 @@ <h1>Get Started!</h1>
       presence: function(presenceEvent) {
           // handle presence
       }
+  });
+}
 function publish(data) {
    
     pubnub = new PubNub({
         publishKey : 'pub-c-74cba35d-fcf7-4821-9932-a6a327f0a018',
         subscribeKey : 'sub-c-0a7113d8-095b-11e7-b09b-0619f8945a4f'
     })
-  
+
     var publishConfig = {
           channel : "credit_writer",
           message : data
       }
-
       pubnub.publish(publishConfig,function(status, response){
         console.log(status,response);
       })
-
       
       pubnub.addListener({
         message: function(m) {
@@ -128,7 +124,6 @@ <h1>Get Started!</h1>
     pubnub.subscribe({
         channels: ['credit_writer'] 
     });
-
 };
     function ConvertFormToJSON(form){
         var array = jQuery(form).serializeArray();
@@ -148,14 +143,10 @@ <h1>Get Started!</h1>
         event.preventDefault();
         
         var form = this;
-
         var json = ConvertFormToJSON(form);
         var tbody = jQuery('#list > tbody');
         console.log(json);
-
-
         publish(json);
-
         /*$.ajax({
           type: "GET",
           url: "/getjson.php",
@@ -170,14 +161,14 @@ <h1>Get Started!</h1>
         }).fail(function() { 
           alert("Failed to add them"); 
         });
-
         return true;
         });
       });*/
-      </script>
+      })
+    });
 
+      </script>
       <form id="add-new-item">
-
           <label for="city">City:</label><br>
           <input id="city" name="city" type="text" required><br>
         
@@ -249,27 +240,20 @@ <h1>Get Started!</h1>
         <br>
         <input id="input" type="submit" name="submit" value="SEARCH" />
       </form>
-
       <div id="musicTable"><ul></ul></div>
-
   </section>
   
   <section id="services" class="sec-services">
     <div class="container">
       <h1>What We Do</h1>
-
       <hr />
-
       <div class="row">
         <div class="col-sm-6 col-sm-offset-3">
           <p>We used the Twitter API to access tweets. That data is then parsed and analized so we can send data to SoCan so they can know where the concert is and for what song theyre getting credit for.</p>
         </div>
       </div>
-
       <h1>APIs Used</h1>
-
       <hr />
-
       <div id="twitter">
         <a href="twitrer.com" target="_blank">
         <img class="twitter" border="0" src="http://www.statisticbrain.com/wp-content/uploads/2015/10/twitter-company-statistics.jpg"/></a>
@@ -279,41 +263,30 @@ <h1>APIs Used</h1>
         
         <a href="mapquest.com">
         <img class="mapquest" border="0" src="http://www.blogcdn.com/blog.aol.com/media/2012/10/mapquestlogolarge.png"/></a>
-
         <a href="pubnub.com">
         <img class="pubnub" border="0" src="https://brandfolder.com/pubnub/logo/pubnub-primary-logo.png"/></a>
       </div>​
-
     </div>
   </section>
-
   <section id="contact" class="sec-contact">
     <div class="container">
       <h1>Contact</h1>
-
       <hr />
-
       <div class="row">
         <div class="col-sm-4 col-sm-offset-4">
           <form class="center-block" action="#" method="post">
             <div class="form-group">
               <label class="sr-only" for="inputName">Full name</label>
-
               <input id="inputName" class="form-control" type="text" placeholder="Name" required />
             </div>
-
             <div class="form-group">
               <label for="inputMail" class="sr-only">Email Address</label>
-
               <input id="inputMail" class="form-control" type="email" placeholder="email@mail.com" required />
             </div>
-
             <div class="form-group">
               <label for="inputMessage" class="sr-only">Your Message</label>
-
               <textarea id="inputMessage" class="form-control" name="message" cols="30" rows="8" required></textarea>
             </div>
-
             <div class="form-group">
               <button class="btn btn-default center-block" type="submit" value="Hire me">Contact</button>
             </div>
@@ -322,26 +295,21 @@ <h1>Contact</h1>
       </div>
     </div>
   </section>
-
   <footer id="footer">
     <div class="container">
       <ul class="soc-media-ul">
         <li>
           <a href="http://twitter.com/AlexDevero" class="fa fa-twitter" target="_blank"></a>
         </li>
-
         <li>
           <a href="https://plus.google.com/u/0/+AlexDevero" class="fa fa-google-plus" target="_blank"></a>
         </li>
-
         <li>
           <a href="http://cz.linkedin.com/pub/alex-devero/38/262/70/" class="fa fa-linkedin" target="_blank"></a>
         </li>
-
         <li>
           <a href="https://www.behance.net/d3v3r0" class="fa fa-behance" target="_blank"></a>
         </li>
-
         <li>
           <a href="mailto:example@mail.com" class="fa fa-envelope"></a>
         </li>
@@ -352,8 +320,6 @@ <h6>© 2017 Credit Writer, SXSW Hackathon</h6>
 </div>
   <script src='http://cdnjs.cloudflare.com/ajax/libs/jquery/2.1.3/jquery.min.js'></script>
 <script src='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js'></script>
-
     <script src="js/index.js"></script>
-
 </body>
 </html>

From a0a1f5a614968f72dc1e7ee664321965653db18d Mon Sep 17 00:00:00 2001
From: Alberto Godinez <alberto.godinez90@gmail.com>
Date: Wed, 15 Mar 2017 11:56:30 -0500
Subject: [PATCH 05/12] edited

---
 index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 3eae1cc..76a16eb 100644
--- a/index.html
+++ b/index.html
@@ -73,7 +73,8 @@ <h1>Get Started!</h1>
       },
       message: function(message) {
         console.log(message);
-        $("#musicTable ul").append('<li>message</li>');
+
+        //$("#musicTable ul").append('<li>'message.song + ' ' message.artist + ' ' + message.location</li>');
           // handle message
       },
       presence: function(presenceEvent) {

From 76aea3a747a2a3e75b818de3a8ba3f901b240b3b Mon Sep 17 00:00:00 2001
From: Alberto Godinez <alberto.godinez90@gmail.com>
Date: Wed, 15 Mar 2017 11:59:32 -0500
Subject: [PATCH 06/12] server

---
 index.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 76a16eb..777a3e4 100644
--- a/index.html
+++ b/index.html
@@ -74,13 +74,16 @@ <h1>Get Started!</h1>
       message: function(message) {
         console.log(message);
 
-        //$("#musicTable ul").append('<li>'message.song + ' ' message.artist + ' ' + message.location</li>');
+        $("#musicTable ul").append('<li>'message.song + ' ' message.artist + ' ' + message.location</li>');
           // handle message
       },
       presence: function(presenceEvent) {
           // handle presence
       }
   });
+     pubnub.subscribe({
+        channels: ['server_starter'] 
+    });
 }
 function publish(data) {
    

From a3e99b0580230f068c7555a88b5627b984aa4437 Mon Sep 17 00:00:00 2001
From: Alberto Godinez <alberto.godinez90@gmail.com>
Date: Wed, 15 Mar 2017 12:02:49 -0500
Subject: [PATCH 07/12] edited js script

---
 index.html | 226 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 226 insertions(+)

diff --git a/index.html b/index.html
index 777a3e4..2afbd7d 100644
--- a/index.html
+++ b/index.html
@@ -171,6 +171,232 @@ <h1>Get Started!</h1>
       })
     });
 
+      </script>
+      <form id="add-new-item">
+          <label for="city">City:</label><br>
+          <input id="city" name="city" type="text" required><br>
+        
+          <label for="new-hashtag">Hashtag:</label><br>
+          <input id="hashtag" name="hashtag" type="text" required><br>
+          
+          <label for="state">State:</label>
+          <select name="state">
+            <option value="AL">AL</option>
+            <option value="AK">AK</option>
+            <option value="AS">AS</option>
+            <option value="AZ">AZ</option>
+            <option value="AR">AR</option>
+            <option value="CA">CA</option>
+            <option value="CO">CO</option>
+            <option value="CT">CT</option>
+            <option value="DE">DE</option>
+            <option value="DC">DC</option>
+            <option value="FL">FL</option>
+            <option value="GA">GA</option>
+            <option value="GU">GU</option>
+            <option value="HI">HI</option>
+            <option value="ID">ID</option>
+            <option value="IL">IL</option>
+            <option value="IN">IN</option>
+            <option value="IA">IA</option>
+            <option value="KS">KS</option>
+            <option value="KY">KY</option>
+            <option value="LA">LA</option>
+            <option value="ME">ME</option>
+            <option value="MD">MD</option>
+            <option value="MH">MH</option>
+            <option value="MA">MA</option>
+            <option value="MI">MI</option>
+            <option value="FM">FM</option>
+            <option value="MN">MN</option>
+            <option value="MS">MS</option>
+            <option value="MO">MO</option>
+            <option value="MT">MT</option>
+            <option value="NE">NE</option>
+            <option value="NV">NV</option>
+            <option value="NH">NH</option>
+            <option value="NJ">NJ</option>
+            <option value="NM">NM</option>
+            <option value="NY">NY</option>
+            <option value="NC">NC</option>
+            <option value="ND">ND</option>
+            <option value="MP">MP</option>
+            <option value="OH">OH</option>
+            <option value="OK">OK</option>
+            <option value="OR">OR</option>
+            <option value="PW">PW</option>
+            <option value="PA">PA</option>
+            <option value="PR">PR</option>
+<!DOCTYPE html>
+<html >
+<head>
+  <meta charset="UTF-8">
+  <title>Credit Writer</title>
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
+  <script src="https://code.jquery.com/jquery-1.10.2.js"></script>
+  <script src="http://ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
+  <script src="https://cdn.pubnub.com/sdk/javascript/pubnub.4.5.0.js"></script>
+
+  <link rel='stylesheet prefetch' href='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css'>
+<link rel='stylesheet prefetch' href='http://fonts.googleapis.com/css?family=Open+Sans:400,300,700'>
+<link rel='stylesheet prefetch' href='http://maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css'>
+
+      <link rel="stylesheet" href="css/style.css">
+
+  
+</head>
+
+<body>
+  <div class="wrapper">
+  <header role="header">
+    <nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+      <div class="container">
+        <div class="navbar-header">
+          <button class="navbar-toggle collapsed" type="button" data-toggle="collapse" data-target=".navbar-collapse" role="button">
+            <span class="sr-only"></span>
+            
+            <span class="icon-bar"></span>
+            
+            <span class="icon-bar"></span>
+            
+            <span class="icon-bar"></span>
+          </button>
+
+          <a href="#" class="navbar-brand">CW</a>
+        </div>
+
+        <div class="collapse navbar-collapse">
+          <ul class="nav navbar-nav navbar-right js-nav">
+            <li><a href="#home">Home</a></li>
+
+            <li><a href="#about">Start</a></li>
+
+            <li><a href="#services">About</a></li>
+
+            <li><a href="#contact">Contact</a></li>
+
+          </ul>
+        </div>
+      </div>
+    </nav>
+  </header>
+
+  <section id="home" class="sec-main">
+    <h1 class="main-heading">Credit Writer</h1>          
+</div>
+  </section>
+
+  <section id="about" class="sec-about">
+    <div class="container" ng-app="myApp" ng-controller="newPlaceCtrl">
+    
+    <h1>Get Started!</h1>
+
+    <script>
+function getInfo(){
+  var pubnub = new PubNub({
+        subscribeKey : 'sub-c-0a7113d8-095b-11e7-b09b-0619f8945a4f'
+  });
+  pubnub.addListener({
+      status: function(statusEvent) {
+      },
+      message: function(message) {
+        console.log(message);
+        $("#musicTable ul").append('<li>' + message.song + ' ' + message.artist + ' ' + message.location + '</li>');
+          // handle message
+      },
+      presence: function(presenceEvent) {
+          // handle presence
+      }
+  });
+     pubnub.subscribe({
+        channels: ['server_sender'] 
+    });
+}
+function publish(data) {
+   
+    pubnub = new PubNub({
+        publishKey : 'pub-c-74cba35d-fcf7-4821-9932-a6a327f0a018',
+        subscribeKey : 'sub-c-0a7113d8-095b-11e7-b09b-0619f8945a4f'
+    })
+    var publishConfig = {
+          channel : "credit_writer",
+          message : data
+      }
+      pubnub.publish(publishConfig,function(status, response){
+        console.log(status,response);
+      })
+      
+      pubnub.addListener({
+        message: function(m) {
+          // handle message
+          var channelName = m.channel; // The channel for which the message belongs
+          var channelGroup = m.subscription; // The channel group or wildcard subscription match (if exists)
+          var pubTT = m.timetoken; // Publish timetoken
+          var msg = m.message; // The Payload
+      },
+      presence: function(p) {
+          // handle presence
+          var action = p.action; // Can be join, leave, state-change or timeout
+          var channelName = p.channel; // The channel for which the message belongs
+          var occupancy = p.occupancy; // No. of users connected with the channel
+          var state = p.state; // User State
+          var channelGroup = p.subscription; //  The channel group or wildcard subscription match (if exists)
+          var publishTime = p.timestamp; // Publish timetoken
+          var timetoken = p.timetoken;  // Current timetoken
+          var uuid = p.uuid; // UUIDs of users who are connected with the channel
+      },
+      status: function(s) {
+          // handle status
+          console.log(s);
+      }
+    })      
+    console.log("Subscribing..");
+    pubnub.subscribe({
+        channels: ['credit_writer'] 
+    });
+};
+    function ConvertFormToJSON(form){
+        var array = jQuery(form).serializeArray();
+        var json = {};
+        
+        jQuery.each(array, function() {
+          json[this.name] = this.value || '';
+        });
+        
+        return json;
+    }
+    
+    jQuery(document).on('ready', function() {
+      console.log('onready');
+      getInfo();
+        jQuery('form#add-new-item').bind('submit', function(event){
+        event.preventDefault();
+        
+        var form = this;
+        var json = ConvertFormToJSON(form);
+        var tbody = jQuery('#list > tbody');
+        console.log(json);
+        publish(json);
+        /*$.ajax({
+          type: "GET",
+          url: "/getjson.php",
+          data: {
+            json: JSON.stringify(json)
+          },
+          dataType: "json"
+        }).always(function() { 
+          tbody.append('<tr><th scope="row" style="background-color:' + form['hashtag'].value + 
+            '"><input type="checkbox" /></th><td>' + form['city'].value +
+            '</td><td>' + form['state'].value + '</td><td>'); 
+        }).fail(function() { 
+          alert("Failed to add them"); 
+        });
+        return true;
+        });
+      });*/
+      })
+    });
       </script>
       <form id="add-new-item">
           <label for="city">City:</label><br>

From 35006a4584eecc7d4eff4429037e36177326e2aa Mon Sep 17 00:00:00 2001
From: Alberto Godinez <alberto.godinez90@gmail.com>
Date: Wed, 15 Mar 2017 12:07:45 -0500
Subject: [PATCH 08/12] edited

---
 index.html | 175 +----------------------------------------------------
 1 file changed, 1 insertion(+), 174 deletions(-)

diff --git a/index.html b/index.html
index 2afbd7d..58f2b63 100644
--- a/index.html
+++ b/index.html
@@ -54,179 +54,6 @@
   </header>
 
   <section id="home" class="sec-main">
-    <h1 class="main-heading">Credit Writer</h1>          
-</div>
-  </section>
-
-  <section id="about" class="sec-about">
-    <div class="container" ng-app="myApp" ng-controller="newPlaceCtrl">
-    
-    <h1>Get Started!</h1>
-
-    <script>
-function getInfo(){
-  var pubnub = new PubNub({
-        subscribeKey : 'sub-c-0a7113d8-095b-11e7-b09b-0619f8945a4f'
-  });
-  pubnub.addListener({
-      status: function(statusEvent) {
-      },
-      message: function(message) {
-        console.log(message);
-
-        $("#musicTable ul").append('<li>'message.song + ' ' message.artist + ' ' + message.location</li>');
-          // handle message
-      },
-      presence: function(presenceEvent) {
-          // handle presence
-      }
-  });
-     pubnub.subscribe({
-        channels: ['server_starter'] 
-    });
-}
-function publish(data) {
-   
-    pubnub = new PubNub({
-        publishKey : 'pub-c-74cba35d-fcf7-4821-9932-a6a327f0a018',
-        subscribeKey : 'sub-c-0a7113d8-095b-11e7-b09b-0619f8945a4f'
-    })
-
-    var publishConfig = {
-          channel : "credit_writer",
-          message : data
-      }
-      pubnub.publish(publishConfig,function(status, response){
-        console.log(status,response);
-      })
-      
-      pubnub.addListener({
-        message: function(m) {
-          // handle message
-          var channelName = m.channel; // The channel for which the message belongs
-          var channelGroup = m.subscription; // The channel group or wildcard subscription match (if exists)
-          var pubTT = m.timetoken; // Publish timetoken
-          var msg = m.message; // The Payload
-      },
-      presence: function(p) {
-          // handle presence
-          var action = p.action; // Can be join, leave, state-change or timeout
-          var channelName = p.channel; // The channel for which the message belongs
-          var occupancy = p.occupancy; // No. of users connected with the channel
-          var state = p.state; // User State
-          var channelGroup = p.subscription; //  The channel group or wildcard subscription match (if exists)
-          var publishTime = p.timestamp; // Publish timetoken
-          var timetoken = p.timetoken;  // Current timetoken
-          var uuid = p.uuid; // UUIDs of users who are connected with the channel
-      },
-      status: function(s) {
-          // handle status
-          console.log(s);
-      }
-    })      
-    console.log("Subscribing..");
-    pubnub.subscribe({
-        channels: ['credit_writer'] 
-    });
-};
-    function ConvertFormToJSON(form){
-        var array = jQuery(form).serializeArray();
-        var json = {};
-        
-        jQuery.each(array, function() {
-          json[this.name] = this.value || '';
-        });
-        
-        return json;
-    }
-    
-    jQuery(document).on('ready', function() {
-      console.log('onready');
-      getInfo();
-        jQuery('form#add-new-item').bind('submit', function(event){
-        event.preventDefault();
-        
-        var form = this;
-        var json = ConvertFormToJSON(form);
-        var tbody = jQuery('#list > tbody');
-        console.log(json);
-        publish(json);
-        /*$.ajax({
-          type: "GET",
-          url: "/getjson.php",
-          data: {
-            json: JSON.stringify(json)
-          },
-          dataType: "json"
-        }).always(function() { 
-          tbody.append('<tr><th scope="row" style="background-color:' + form['hashtag'].value + 
-            '"><input type="checkbox" /></th><td>' + form['city'].value +
-            '</td><td>' + form['state'].value + '</td><td>'); 
-        }).fail(function() { 
-          alert("Failed to add them"); 
-        });
-        return true;
-        });
-      });*/
-      })
-    });
-
-      </script>
-      <form id="add-new-item">
-          <label for="city">City:</label><br>
-          <input id="city" name="city" type="text" required><br>
-        
-          <label for="new-hashtag">Hashtag:</label><br>
-          <input id="hashtag" name="hashtag" type="text" required><br>
-          
-          <label for="state">State:</label>
-          <select name="state">
-            <option value="AL">AL</option>
-            <option value="AK">AK</option>
-            <option value="AS">AS</option>
-            <option value="AZ">AZ</option>
-            <option value="AR">AR</option>
-            <option value="CA">CA</option>
-            <option value="CO">CO</option>
-            <option value="CT">CT</option>
-            <option value="DE">DE</option>
-            <option value="DC">DC</option>
-            <option value="FL">FL</option>
-            <option value="GA">GA</option>
-            <option value="GU">GU</option>
-            <option value="HI">HI</option>
-            <option value="ID">ID</option>
-            <option value="IL">IL</option>
-            <option value="IN">IN</option>
-            <option value="IA">IA</option>
-            <option value="KS">KS</option>
-            <option value="KY">KY</option>
-            <option value="LA">LA</option>
-            <option value="ME">ME</option>
-            <option value="MD">MD</option>
-            <option value="MH">MH</option>
-            <option value="MA">MA</option>
-            <option value="MI">MI</option>
-            <option value="FM">FM</option>
-            <option value="MN">MN</option>
-            <option value="MS">MS</option>
-            <option value="MO">MO</option>
-            <option value="MT">MT</option>
-            <option value="NE">NE</option>
-            <option value="NV">NV</option>
-            <option value="NH">NH</option>
-            <option value="NJ">NJ</option>
-            <option value="NM">NM</option>
-            <option value="NY">NY</option>
-            <option value="NC">NC</option>
-            <option value="ND">ND</option>
-            <option value="MP">MP</option>
-            <option value="OH">OH</option>
-            <option value="OK">OK</option>
-            <option value="OR">OR</option>
-            <option value="PW">PW</option>
-            <option value="PA">PA</option>
-            <option value="PR">PR</option>
 <!DOCTYPE html>
 <html >
 <head>
@@ -302,7 +129,7 @@ <h1>Get Started!</h1>
       },
       message: function(message) {
         console.log(message);
-        $("#musicTable ul").append('<li>' + message.song + ' ' + message.artist + ' ' + message.location + '</li>');
+        $("#musicTable ul").append('<li>' + message.message.artist + ' ' + message.message.setlist + ' ' + message.message.song + '</li>');
           // handle message
       },
       presence: function(presenceEvent) {

From 17870dec389ea07978c8d8f7e85d7d48a9ccfc47 Mon Sep 17 00:00:00 2001
From: Alberto Godinez <alberto.godinez90@gmail.com>
Date: Wed, 15 Mar 2017 12:10:10 -0500
Subject: [PATCH 09/12] edited

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 58f2b63..19046ef 100644
--- a/index.html
+++ b/index.html
@@ -129,7 +129,7 @@ <h1>Get Started!</h1>
       },
       message: function(message) {
         console.log(message);
-        $("#musicTable ul").append('<li>' + message.message.artist + ' ' + message.message.setlist + ' ' + message.message.song + '</li>');
+        $("#musicTable ul").append('<li>Artist: ' + message.message.artist + ' Set List: ' + message.message.setlist + ' City: ' + message.message.city + '</li>');
           // handle message
       },
       presence: function(presenceEvent) {

From 65c6b752b3960434102bc7c1adf10f548fb825d4 Mon Sep 17 00:00:00 2001
From: Roberto Hernandez <hernandezr@smu.edu>
Date: Wed, 15 Mar 2017 12:33:37 -0500
Subject: [PATCH 10/12] team added

---
 index.html | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/index.html b/index.html
index 19046ef..e57bc29 100644
--- a/index.html
+++ b/index.html
@@ -309,6 +309,54 @@ <h1>What We Do</h1>
           <p>We used the Twitter API to access tweets. That data is then parsed and analized so we can send data to SoCan so they can know where the concert is and for what song theyre getting credit for.</p>
         </div>
       </div>
+      
+            <h1>TEAM</h1>
+
+      <hr />
+
+<section class="cf team-container">
+
+    <!-- member-->  
+    <div class="team-member">
+      <img class="team-photo" src="https://media.licdn.com/mpr/mpr/shrinknp_200_200/AAEAAQAAAAAAAAgsAAAAJGQyODQwMmE5LTVlNTYtNDM0Ny05NzYwLWM0NDgwNTcxZWU3OA.jpg">
+      <h3>Sanat Sharma</h3>
+      <span>Worked on the backend</span>
+    </div>
+
+
+    <!-- member-->
+    <div class="team-member">
+    <img class="team-photo" src="https://raw.githubusercontent.com/theCreedo/theCreedo.github.io/master/images/blog-profile.png">
+      <h3>Eric Lee</h3>
+      <span>Worked on the backend</span>
+    </div>
+
+
+    <!-- member-->
+    <div class="team-member">
+    <img class="team-photo" src="https://media.licdn.com/mpr/mpr/shrinknp_100_100/AAEAAQAAAAAAAASHAAAAJDcyN2RkMmNiLTA2YTctNDM4Yy05MmNmLWNmYWMwM2Q1ZmU1Ng.jpg">
+      <h3>Roberto Hernandez</h3>
+      <span>Worked on the frontend</span>
+    </div> 
+
+
+    <!-- member-->
+    <div class="team-member">
+    <img class="team-photo" src="https://media.licdn.com/mpr/mpr/shrinknp_400_400/AAEAAQAAAAAAAALLAAAAJDA3NDEwZWJlLWUyZDUtNDJkMC04NWFiLWFlMDM3ZGVlNzllMA.jpg">
+      <h3>Alberto Godinez</h3>
+      <span>Worked on the backend</span>
+    </div>
+
+
+    <!-- member-->
+    <div class="team-member">
+    <img class="team-photo" src="http://i.imgur.com/Jum88iY.jpg">
+      <h3>Linda Xie</h3>
+      <span>Worked on the backend</span>
+    </div> 
+  
+ </section>
+      
       <h1>APIs Used</h1>
       <hr />
       <div id="twitter">

From 11bcbacd7038d4fddd118faad057d71db74946ce Mon Sep 17 00:00:00 2001
From: Roberto Hernandez <hernandezr@smu.edu>
Date: Wed, 15 Mar 2017 12:39:44 -0500
Subject: [PATCH 11/12] cute stuff

---
 css/style.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/css/style.css b/css/style.css
index a3226fc..4d9be1c 100644
--- a/css/style.css
+++ b/css/style.css
@@ -1,3 +1,19 @@
+#musicTable li{
+	position: relative;
+	text-align: 
+  width: 200px;
+  height: 100px;
+  text-align: center;
+  line-height: 100px;
+  background-color: #fff;
+  border: 8px solid #666;
+  -webkit-border-radius: 30px;
+  -moz-border-radius: 30px;
+  border-radius: 30px;
+  -webkit-box-shadow: 2px 2px 4px #888;
+  -moz-box-shadow: 2px 2px 4px #888;
+  box-shadow: 2px 2px 4px #888;
+}
 /* Team Member CSS 
 ===========================*/
 

From 9843c0c5bc81e8dd778efd7c381424d64a64b7de Mon Sep 17 00:00:00 2001
From: Roberto Hernandez <hernandezr@smu.edu>
Date: Wed, 15 Mar 2017 12:44:45 -0500
Subject: [PATCH 12/12] rh pic

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index e57bc29..f27d625 100644
--- a/index.html
+++ b/index.html
@@ -334,7 +334,7 @@ <h3>Eric Lee</h3>
 
     <!-- member-->
     <div class="team-member">
-    <img class="team-photo" src="https://media.licdn.com/mpr/mpr/shrinknp_100_100/AAEAAQAAAAAAAASHAAAAJDcyN2RkMmNiLTA2YTctNDM4Yy05MmNmLWNmYWMwM2Q1ZmU1Ng.jpg">
+    <img class="team-photo" src="https://media.licdn.com/media/AAEAAQAAAAAAAASHAAAAJDcyN2RkMmNiLTA2YTctNDM4Yy05MmNmLWNmYWMwM2Q1ZmU1Ng.jpg">
       <h3>Roberto Hernandez</h3>
       <span>Worked on the frontend</span>
     </div>