Merge pull request #66 from colinmccann/master

sync button functionality fixed, spelling mistake fixed

Author: mackrauss

index.html

@@ -245,7 +245,7 @@ <h1>EvoRoom</h1>
         <div id="interview-intro" class="full-text-box" style="display:none">
             <div class="title"><b>Step 2 complete</b></div>
             <div>
-                Your next task is to locate these reserachers (see below) and find out more information about THEIR rainforests.
+                Your next task is to locate these researchers (see below) and find out more information about THEIR rainforests.
                 After all, how will you know which rainforest is yours if you don't know how the other rainforests came to be?
                 Maybe you can offer your expertise to help them find their rainforests as well. When you are ready, click on
                 their names to begin.

js/evoroom.js

@@ -894,7 +894,8 @@ var EvoRoom = {
                             $('#group-notes .notes.'+x).text(data.results[x-1].payload.notes);
                         }
                         else {
-                            data.results[x-1].payload.notes.text('');
+                            //data.results[x-1].payload.notes.text('');
+                            $('#group-notes .notes.'+x).text('');
                         }
                     }
                 }
@@ -911,6 +912,8 @@ var EvoRoom = {
             return "Rainforest C";
         } else if (rainforestString === "rainforest_d") {
             return "Rainforest D";
+        } else if (rainforestString === "room") {
+            alert("An error has occured. Please talk to a teacher"
         } else {
             return "unknown rainforest";
         }