Fixed some conflicts

Author: alcarney

sessions.html

@@ -11,6 +11,7 @@ <h1>Sessions</h1>
     <ol>
         <li><b>Week 1:</b> "Real Men" <i>Quote of the Session</i> "Only real men code in Arch!" - Jason, Post Grad</li>
         <li><b>Week 2:</b> "On the Fly" <i>Quote of the Session</i> "love the fact that I'm learning Vim on the fly!" - Adam, 2nd year student</li>
+        <li><b>Week 4:</b> "What is Django for" <i>Quote of the Session</i> "I know that pinterest use it but I don't see the connection." - Alex, 2nd year student</li>
 
     </ol>