.obsidian/workspace.json

@@ -13,7 +13,7 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "UNB/Year 5/Semester 1/HIST1451/In class notes.md",
+                "file": "UNB/Year 5/Semester 1/CS3113/In class notes.md",
                 "mode": "source",
                 "source": false
               }
@@ -85,7 +85,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "UNB/Year 5/Semester 1/HIST1451/In class notes.md",
+                "file": "UNB/Year 5/Semester 1/CS3113/In class notes.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -102,7 +102,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "UNB/Year 5/Semester 1/HIST1451/In class notes.md",
+                "file": "UNB/Year 5/Semester 1/CS3113/In class notes.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -125,7 +125,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "UNB/Year 5/Semester 1/HIST1451/In class notes.md"
+                "file": "UNB/Year 5/Semester 1/CS3113/In class notes.md"
               }
             }
           }
@@ -149,8 +149,8 @@
   },
   "active": "a06cabd352081cbd",
   "lastOpenFiles": [
-    "UNB/Year 5/Semester 1/CS3113/In class notes.md",
     "UNB/Year 5/Semester 1/HIST1001/In class notes.md",
+    "UNB/Year 5/Semester 1/CS3113/In class notes.md",
     "UNB/Year 5/Semester 1/CS3113",
     "UNB/Year 5/Semester 1/HIST1451/In class notes.md",
     "UNB/Year 5/Semester 1/HIST1001",

UNB/Year 5/Semester 1/CS3113/In class notes.md

@@ -1,4 +1,4 @@
-## Convert numbers to binary
+e hn## Convert numbers to binary
 Number in decimal: 53.7
 ### Decimal conversion
 

UNB/Year 5/Semester 1/HIST1451/In class notes.md

@@ -40,71 +40,4 @@
 	- Became a part of american liberalism philosophy
 	- Governments exist not because of divine intervention but rather to protect the rights of individuals
 	- Americans did not refer to themselves this way, but was later applied in the 20th century to describe early american ideology
-- Laissez Faire Liberalism
+- 
-	- Turn of the 1890s century til mid 1930s
-	- Social Darwinism
-	- Government should not interfere in the lives of the people or in industry
-	- No social nets
-	- If misfortune found you it was probably your fault
-	- If you were a captain of industry you were doing something right and should be rewarded
-	- Turn of the Century
-		- Industrialization, urbanization, and immigration
-		- Rise of progressives, with the notion of order, control and progress
-- 20th Century Liberalism
-	- New Deal liberalism
-	- State over the individual
-	- Equality
-	- Focus on progress. Making ourselves and society better. We can get better
-	- The government has an important role to play in improving society
-	- Values diversity
-## Progressive-ism
-- 20th Century Progressivism
-	- 1900-1920
-	- Progressive era
-	- Social reform movement
-	- Both Democrats and Republican. Teddy Roosevelt and Woodrow Wilson
-	- COP = Control, Order, Progress
-	- Child Labor Laws, Food safety
-- 21st Century Progressivism
-	- 2000s
-	- Leftist Democrats
-	- Congressional Progressive caucus founded 1991
-	- "Medicare for all"
-	- Dead with economic hardships "living wage"
-	- Civil service reform, food safety, rights for women and US workers, climate change, Humane immigration policies
-## Conservatism
-- The word (and human kind) is flawed. It will always be so
-- Society should be governed by natural laws and ones conscience
-- Tradition and hierarchy are important
-- Government exist to protect individual freedoms
-- Economic freedom is an extension of individual freedom
-- Taking the constitution literally, at face value
-## Libertarian-ism
-- Similar to conservatism (fiscal conservatism)
-- But socially liberal
-- Liberty is the core principle
-- Maximize political freedom
-- Skeptical of the authority of state power
-## Capitalism
-- Economic Indivudialism
-- Private ownership of the means of production (business) and capital (banks, land, property)
-- Low levels of taxation and regulation
-- Unfettered competition. No subsidies, ballots or protectionism
-- Free flow of goods, services and capital both domestically and internationally
-- GNP - Gross national product, includes GDP
-## Fascism (Right)
-- Authoritarianism that relies on dictatorial power
-- One party dictatorship
-- It holds that opposition should be forcibly suppressed
-- The strong regimentation of the economy
-- The government controls all aspects of behavior. Social regimentation
-## Trump-ism: The philosophy espoused by Donald Trump
-- Authoritarian
-- National: America first (make america great again)
-- Traditional: Reliance on old industries - coal, steel, farming
-- Hierarchical (race and gender)
-- Populist (anti-elitist, sort of)
-- Anti-immigrant
-- Cuts taxes, opposes free trade
-- Opposes government regulation
-- Anti-abortion (sort of)