Backup of Obsidian Vault on 04-03-24 : 03:26:40 from SamPC | 4 files …

…changed

Details:
M content/Computer Science/Algorithms & Data Structures Analysis/Notes/3.3 Radix Sort.md content/Computer Science/Cybersecurity Fundamentals/Cybersecurity Fundamentals.md, R content/Computer Science/Cybersecurity Fundamentals/Notes/1.1 Cybersecurity Overview.md content/Computer Science/Cybersecurity Fundamentals/Notes/2.1 Applied Cryptography.md

content/Computer Science/Algorithms & Data Structures Analysis/Notes/3.3 Radix Sort.md

@@ -1,6 +1,6 @@
 
 > [!idea]+ Radix Sort
-> Radix sort is used to sort numbers from their least significant digit to their most significant digit. [[3.2 Counting Sort|Counting Sort]] is used as the subroutine to sort the digits, because it is [[Stable Sort|stable]]. 
+> Radix sort is used to sort numbers from their least significant digit to their most significant digit. [[3.2 Counting Sort|Counting Sort]] is used as the subroutine to sort the digits, because it is [[Stable Sort|stable]] and asymptotically fast - $O(n)$
 
 ![[3.2.2]]
 

content/Computer Science/Cybersecurity Fundamentals/Cybersecurity Fundamentals.md

@@ -1,10 +1,6 @@
-<<<<<<< HEAD
 
-| Week | Notes                      | Workshops                                                                  | Assignments                             |
-| ---- | -------------------------- | -------------------------------------------------------------------------- | --------------------------------------- |
-| 1    | [[Cybersecurity Overview]] |                                                                            |                                         |
-| 2    | [[Applied Cryptography]]   | [Workshop 1](https://github.com/santiagosayshey/CF-S2-2024/tree/workshop1) | [[Assignment 1 - Intro & Cryptography]] |
-
-=======
-In this course, you will be introduced to real-world cybersecurity challenges that organisations face, and learn to apply knowledge and skills gained through other Computer Science courses to address them. The challenges will be examined both from the attacker's perspective (how systems are exploited) and the defender's perspectives (how to secure systems or respond to threats). Common attack and defence strategies for software, web applications, networks, operating systems, cryptographic systems and humans will be explored. The course will also introduce cybersecurity management concepts, including security operations, risk management, security engineering and security architecture, as well as provide guidance on different career paths specialising in cybersecurity. We will also discuss the legal and ethical aspects of information security. This course focuses on hands-on activities, and students are encouraged to participate in public and industry cybersecurity challenges, including capture-the-flag competitions.
->>>>>>> origin/v4
+| Week | Notes                          | Workshops                                                                  | Assignments                             |
+| ---- | ------------------------------ | -------------------------------------------------------------------------- | --------------------------------------- |
+| 1    | [[1.1 Cybersecurity Overview]] |                                                                            |                                         |
+| 2    | [[2.1 Applied Cryptography]]   | [Workshop 1](https://github.com/santiagosayshey/CF-S2-2024/tree/workshop1) | [[Assignment 1 - Intro & Cryptography]] |
+| 3    |                                |                                                                            |                                         |