Removed commented lines and styled template files.

widget_Francoconuts/forum/templates/Forum/post_detail.html

@@ -2,7 +2,11 @@
   {{post.post_title}}
 </h1>
 
+<<<<<<< HEAD
 <h4 style="background-color:Aquamarine;">
+=======
+<h4>
+>>>>>>> master
   {{post.author.first_name}} {{post.author.last_name}}, {{post.pub_date.day}}/{{post.pub_date.month}}/{{post.pub_date.year}}
 </h4>
 
@@ -20,7 +24,7 @@
 
         <li>
           <u>
-            Reply by {{reply.reply_author.first_name}} {{reply.reply_author.last_name}} dated {{reply.pub_date.day}}/{{reply.pub_date.month}}/{{reply.pub_date.year}}:
+            Reply by {{reply.author.first_name}} {{reply.author.last_name}} dated {{reply.pub_date.day}}/{{reply.pub_date.month}}/{{reply.pub_date.year}}:
           </u>
             <br>
           {{reply.reply_body}}
@@ -33,6 +37,10 @@
     {% endfor %}
 
     {% load static %}
+<<<<<<< HEAD
     <marquee behavior="alternate" scrollamount="200"><img src="{% static 'forum/hypers.jpg' %}" alt="image">
+=======
+    <img src="{% static 'forum/hypers.jpg' %}" alt="image">
+>>>>>>> master
 
     </ul>