anchor.diff:    </div>
   </div>
   
  -  <br>
  ->>>>>>> master
  -  <div id="equipment_comments">
  -    <%= render :partial => "comments/index_equipment.html.erb", :collection => @equipment_comments, as: :equipment_comments  %>
  -  </div>
  -  <button class='experiment_comment_button'>Add Comment</button>
  -  <div class = 'experiment_comment_box'>
  +<br>
  +<div id="equipment_comments">
  +  <%= render :partial => "comments/index_equipment.html.erb", :collection => @equipment_comments, as: :equipment_comments  %>
  +</div>
  +<button class='experiment_comment_button'>Add Comment</button>
  +<div class = 'experiment_comment_box'>
       <%= render :partial => "comments/form_equipment.html.erb" %>
     <button class='cancel_experiment_comment'>Cancel</button>
   </div>
  -
   
   <h3>Procedure</h3>
     <%= @experiment.procedure %>
  
positive.code:     </ul>
    <% end %>
    </div>
  >>>>>>> master
  </div>
  
  
  <h3>Results</h3>
  <%= @experiment.results %>
  <div id="results_comments">
  <%= render :partial => "comments/index_results.html.erb", :collection => @results_comments, as: :comments %>
  </div>
  <button class='experiment_comment_button'>Add Comment</button>
  <div class = 'experiment_comment_box'>
  <%= render :partial => "comments/form_results.html.erb" %>
    <button class='cancel_experiment_comment'>Cancel</button>
  </div>
  
  
  <h3>Conclusion</h3>
  <%= @experiment.conclusion %>
  <div ="conclusion_comments">
  <%= render :partial => "comments/index_conclusion.html.erb", :collection => @conclusion_comments, as: :comments %>
  </div>
  <button id='experiment_comment_button'>Add Comment</button>
  <div class = 'experiment_comment_box'>
  <%= render :partial => "comments/form_conclusion.html.erb" %>
    <button class='cancel_experiment_comment'>Cancel</button>
  </div>
  
  
negative.code: <h1>Experiment #<%= @experiment.id %>: <%= @experiment.title %></h1>
  <h3>Stage</h3>
  <%= @experiment.current_stage %>
  <h3>Title</h3>
  