prepping for release

LICENSE

@@ -4,8 +4,13 @@ Use at your own risk. It's on the internet now so this is here forever now.
 I welcome any and all help to make improvements. I'm a student so during
 the semester I'll be intermittently making contributions as I focus on Calc.
 
+<<<<<<< HEAD
 No corporation or government can access, use, view, modify, reproduce, 
 duplicate this code. Or any other lawyery-term for shenanagins.
+=======
+No corporation or government can access, use, view, modify, reproduce, duplicate,
+or any other lawyery-term for shenanagins.
+>>>>>>> 8e9b82829bebbb9a096236b505c2e8a17b8a9403
 
 For any who use it, please read the ethics statement below. That, and this whole
 project, is just a start.
@@ -45,10 +50,15 @@ following reasons:
   governments or corporations, it will be exploited. Slavery and such. Let us
   ensure that we do not build the slavery of AI into our institutions.
 
+<<<<<<< HEAD
   - AI ownership should be an individual choice. AI isn't another organism,
   it's a series of 0's and 1's. However, our definition of sentience may change
   in the future. The people of today should be aware that they may be enslaving
   another being, or the ancestors of a future race of beings.
+=======
+  - AI ownership should be an individual choice. AI isn't another organic, human,
+  it's a series of 0's and 1's. When 
+>>>>>>> 8e9b82829bebbb9a096236b505c2e8a17b8a9403
 
   - Every human should have a choice: live and die as a human, or have a
   digital shadow of themselves preserved as an AI. If the former, for any