Fixed merge conflicts

Merge branch '37-permitted-use' of github.com:CSAFE-ISU/handwriterApp into 37-permitted-use

# Conflicts:
#	inst/extdata/HTML/permitted_use.html

inst/extdata/HTML/permitted_use.html

@@ -5,7 +5,7 @@ <h1>Permitted Use of CSAFE’s handwriter Software</h1>
   <p>
     <b>Effective Date: September 30, 2024</b>
   </p>
-  
+
   <h2>Overview</h2>
   <p> This document outlines permitted uses of the Center for Statistics and Applications in Forensic Evidence’s handwriter software. The software is currently undergoing beta testing and may be used in research and additional testing within forensic labs. The software is not yet validated for casework or court testimony.
   </p>