Merged master with develop

.gitignore

@@ -1,3 +1,6 @@
+.idea/
+Gemfile.lock
+
 *~
 *.rbc
 capybara-*.html

app/controllers/snippets_controller.rb

@@ -22,7 +22,7 @@ def json
       |snippet|
       hash = {};
       snippet.attributes.each{ |k,v| # All attributes of current snippet
-        if k != "created_at" && k != "updated_at" && k != "showTime"
+        if k != "created_at" && k != "updated_at" && k != "showTime" && k != "id"
           hash[k] = v
         end
       }
@@ -37,8 +37,10 @@ def json
 
       timeRemaining = (startTime - Time.zone.now + snippet.showTime).round
       #      timeRemaining = -1 if timeRemaining < 0,
+        hash["timeRemaining"]=timeRemaining
+
+      map[snippet.id]=hash
 
-      snippets[timeRemaining]=hash
     }
     jsonMap['snippets'] = snippets;
     render json: jsonMap

app/views/snippets/_form.html.erb

@@ -32,7 +32,7 @@
  <h2>rating marks</h2>
     <% @rating_marks.each do |r| %>
       <%= label_tag r.title  %>
-      <%= check_box_tag "rating_marks[#{r.id}]", r.id  %>
+      <%= check_box_tag "rating_marks[#{r.id}]", r.id, checked=true  %>
       <br />
       <% end %>
   <p>

startServer.sh

@@ -1,2 +1,6 @@
 #!/bin/bash
 bin/rails s -p3000 -b* -e development
+<<<<<<< HEAD
+=======
+
+>>>>>>> master