Merge branch 'main' of https://github.com/Showmick119/Searching-and-Sorting-Algorithms

Author: Showmick119

README.md

@@ -1,16 +1,19 @@
-# Searching-and-Sorting-Algorithms
+# Searching and Sorting Algorithms
 
-A Java implementation of searching and sorting algorithms with support for standard data types.
+A Java implementation of searching and sorting algorithms to solve a fun problem of ranking programming languages like Python, C++, Rust, etc in a tabular format, based on randomly generated data. This problem showcases my understanding of concepts like Polymorphism, Encapsulation, Abstraction and Inheritance. Alongside displaying my ability to follow documentation principles with Javadoc. These skills will come handy when I'll need to understand and work with legacy code.
 
 ## Features
 
 - Merge Sort implementation
 - Insertion Sort implementation
 - Binary Search implementation
 - Custom Datapoint class for handling multi-column data
+<<<<<<< HEAD
 - Generic type support for sorting and searching operations
 - Comprehensive JUnit tests for all algorithms
 - Continuous Integration via GitHub Actions
+=======
+>>>>>>> 34dcf0218d65300c3091a4e16230acd7571c4c33
 
 ## Usage