Fix all conflicts.

Author: chrismattmann

classes/dsci550_2024a/index.html

@@ -338,6 +338,11 @@ <h2 class="section-heading">Schedule <font class="usc-color">(subject to change;
                         <li>Shim, Jungwon Roy. "Arium: Beyond the Desktop Metaphor: A new way of navigating, searching, and organizing personal digital data." Masters Thesus, Carnegie Mellon University (2012).<strong>(Presented by: Vu Nguyen)</strong></li>
                         <li>Crowder, Jerome, Jonathan Marion, and Michele Reilly. "File Naming in Digital Media Research: Examples from the Humanities and Social Sciences." Journal of Librarianship and Scholarly Communication 3.3 (2015). <strong>(Presented by: Kyle Parker)</strong></li>
                         <li>Jackson, Andrew N. "Formats over time: Exploring UK web history." arXiv preprint arXiv:1210.1714 (2012). <strong>(Presented by: Mario Vigil)</strong></li>
+                        <li>Freed, Ned. RFC 2048 "Multipurpose internet mail extensions (MIME) part four: Registration procedures." ISI (1996). <strong>(Presented by: ) </strong> </li>
+                        <li>Hicks, Ben J., et al. "Organizing and managing personal electronic files: A mechanical engineer's perspective." ACM Transactions on Information Systems (TOIS) 26.4 (2008): 23.</li>
+                        <li>Shim, Jungwon Roy. "Arium: Beyond the Desktop Metaphor: A new way of navigating, searching, and organizing personal digital data." Masters Thesus, Carnegie Mellon University (2012).<strong>(Presented by: )</strong></li>
+                        <li>Crowder, Jerome, Jonathan Marion, and Michele Reilly. "File Naming in Digital Media Research: Examples from the Humanities and Social Sciences." Journal of Librarianship and Scholarly Communication 3.3 (2015). <strong>(Presented by: )</strong></li>
+                        <li>Jackson, Andrew N. "Formats over time: Exploring UK web history." arXiv preprint arXiv:1210.1714 (2012). </li>
 						</ul>
            	        </td>
            	        <td>&nbsp;</td>