Merge branch 'master' - keeping local version

Author: lenis2000

undergraduate/placement-files/diagnostic_aleks.html

@@ -1,12 +1,15 @@
 ---
 title: ALEKS Diagnostic
 layout: ug_page
-ug_policy: true
+ug_policy: false
 permalink: /undergraduate/diagnostic_aleks/
 nav_parent: Undergraduate
 nav_weight: 4
 tooltips: true
 ---
+<<<<<<<< HEAD:undergraduate/placement-files/diagnostic_aleks.html
 
 
+========
+>>>>>>>> 88deacfb1538f964f32c89f8cbda5386a92a5e6b:undergraduate/diagnostic_aleks
 <h1 class="mb-4">ALEKS Diagnostic</h1>