Update README.md

README.md

@@ -3,27 +3,6 @@
 This is my (Eli Bradley's) computer science project, a Kotlin DSL focusing on various topics I've learned about
 through school and just on my own. This includes:
 
-<<<<<<< HEAD
-- [X] Vector Algebra
-- [X] Multivariable Calculus
-  - [X] Gradient Descent
-- [X] Basic Linear Algebra
-- [X] Electrostatic Simulations
-- [X] Analytic Transformations
-  - [X] Taylor Series
-  - [ ] Fourier Series and Transformations
-- [X] Complex Algebra
-  - [X] Complex Numbers
-  - [X] Complex Vectors
-  - [X] Complex Matrices
-- [X] Quantum Computing
-  - [X] Entangled Qubit States
-  - [X] Quantum Gates
-  - [X] Quantum Circuits
-    - [X] Parallel Gates
-    - [X] Sequential Gates
-  - [X] Measuring
-=======
 ## Introduction
 MathLibrary is a comprehensive Kotlin Domain-Specific Language (DSL) designed to facilitate a wide range of mathematical operations, including vector algebra, multivariable calculus, and quantum computing simulations. Developed out of a passion for applying computer science concepts to real-world mathematical problems, this library serves as a toolkit for developers seeking to simplify complex calculations and simulations.
 
@@ -57,4 +36,3 @@ The project is organized into modules based on subject, making it easy to naviga
 
 ## Contact
 To contact us, please email us at [[email protected]](mailto:[email protected]).
->>>>>>> e822620 (README.md overhaul and improvements)