fix merge conflict

Reviewed-on: https://git.eggworld.tk/eggy/eifueo/pulls/12

README.md

@@ -2,6 +2,21 @@
 
 A "competitor" of sorts to magicalsoup/highschool.
 
-Please note that the clone link is incorrect; it should be `https://git.eggworld.tk/eggy/eifueo.git`.
+The LaTeX formatting in this repository uses `$...$` for inline math, and `$$...$$` for multi-line math. MathJax is used to render this LaTeX.
 
-The LaTeX formatting in this repository uses `$...$` for inline math, and `$$...$$` for multi-line math.
+Admonitions can be added with documentation available [here](https://squidfunk.github.io/mkdocs-material/reference/admonitions/#usage).
+
+## Dependencies
+
+ - `mkdocs`
+ - `mkdocs-material`
+ - `mkdocs-material-extensions`
+ - `python-markdown-math`
+
+## Build instructions
+
+MkDocs is used to build the site.
+
+```
+mkdocs build
+```

docs/eng3uz.md

@@ -133,3 +133,7 @@ The course code for this page is **ENG3UZ**.
 	- e.g., *"I don't want to! That candy is MINE, and no one is going to take it from ME! Mine, mine, MINE!"*
  - Theme: The "main idea" or underlying meaning of a literary work, which can be given directly or indirectly.
 	- e.g., *"Never forget that* you are royalty, *and that hundreds of thousands of souls have suffered and perished so you could become what you are. By their sacrifices, you have been given the comforts you take for granted. Always remember them, so that their sacrifices shall never be without meaning."* (*Eon Fable*, ScytheRider)
+
+## Resources
+
+ - [Analysis of a Poem](/resources/g11/central-asserion-1.pdf)

docs/index.md

@@ -15,3 +15,7 @@ If you would like to contribute by submitting fixes, requesting pages, and/or co
 ## Source
 
 The source for Eifueo is available [here](https://git.eggworld.tk/eggy/eifueo).
+
+## Acknowledgements
+
+Thanks to James Su, Lakshy Gupta, and Vincent Guo for providing supplementary data for accuracy and conciseness.

docs/sph3u7.md

@@ -4,6 +4,9 @@ The course code for this page is **SPH3U7**.
 
 ## 1.1 - Measurements in physics
 
+!!! reminder
+    All physical quantities must be expressed as a **product** of a magnitude and a unit. For example, ten metres should be written as $10 \text{ m}$.
+
 ### Fundamental units
 
 Every other SI unit is derived from the fundamental SI units. Memorise these!
@@ -20,7 +23,7 @@ Every other SI unit is derived from the fundamental SI units. Memorise these!
 
 ### Metric prefixes
 
-Every SI unit can be expanded with metric prefixes.
+Every SI unit can be expanded with metric prefixes. Note that the difference between many of these prefixes is $10^3$.
 
 !!! example
     milli + metre = millimetre ($10^{-3}$) m
@@ -97,10 +100,7 @@ The order of magnitude of a number can be found by converting it to scientific n
 
 ### Uncertainties
 
-Uncertainties are stated in the form of [value] ± [uncertainty]. A value is only as precise as its absolute uncertainty. Absolute uncertainty of **measurement** is usually represented to only 1 significant digit.
+Uncertainties are stated in the form of $a±\Delta a$. A value is only as precise as its absolute uncertainty. Absolute uncertainty of a **measurement** is usually represented to only 1 significant digit.
-
-!!! note
-    Variables with uncertainty use an uppercase delta for their uncertainty value: $a ± \Delta a$
 
  - The absolute uncertainty of a number is written in the same unit as the value.
  - The percentage uncertainty of a number is the written as a percentage of the value.
@@ -112,7 +112,7 @@ Uncertainties are stated in the form of [value] ± [uncertainty]. A value is onl
 To determine a measurement's absolute uncertainty, if:
 
  - the instrument states its uncertainty, use that.
- - an analog instrument is used, the last digit is estimated and appended to the end of the reported value. The estimated digit is uncertain by 5 at its order of magnitude.
+ - an analog instrument is used, half of the most precise reading is uncertain.
  - a digital instrument is used, the last reported digit is uncertain by 1 at its order of magnitude.
 
 !!! example
@@ -123,18 +123,15 @@ See [Dealing with Uncertainties](/resources/g11/physics-uncertainties.pdf) for h
 
 ### Error bars
 
-Error bars represent the uncertainty of the data, typically representing that data point's standard deviation, and can be both horizontal or vertical.
+Error bars represent the uncertainty of the data, typically representing that data point's standard deviation, and can be both horizontal or vertical. A data point with uncertain values is written as $(x ± \Delta x, y ± \Delta y)$
 
 <img src="/resources/images/error-bars.png" width=600>(Source: Kognity)</img>
 
-!!! note
-    On a graph, a data point with uncertain values is written as $(x ± \Delta x, y ± \Delta y)$
-
 ### Uncertainty of gradient and intercepts
 
 !!! note "Definition"
-    - The **line of best fit** is the line that passes through **all error bars** while passing as closely as possible to all data points.
+    - The **line of best fit** is the line that passes through **as many error bars as possible** while passing as closely as possible to all data points.
-    - The **minimum and maximum lines** are lines that minimise/maximise their slopes while still passing through **all error bars.**
+    - The **minimum and maximum lines** are lines that minimise/maximise their slopes while passing through the first and last **error bars**.
 
 !!! warning
     - Use solid lines for lines representing **continuous data** and dotted lines for **discrete data**.
@@ -142,13 +139,134 @@ Error bars represent the uncertainty of the data, typically representing that da
 <img src="/resources/images/error-slopes.png" width=700>(Source: Kognity)</img>
 
 The uncertainty of the **slope** of the line of best fit is the difference between the maximum and minimum slopes.
-$$m_{best fit} ± m_{max}-m_{min}$$
+$$m_{\text{best fit}} ± \frac{m_{\max}-m_{\min}}{2}$$
 The uncertainty of the **intercepts** is the difference between the intercepts of the maximum and minimum lines.
-$$intercept_{best fit} ± intercept_{max} - intercept_{min}$$
+$$\text{intercept}_{\text{best fit}} ± \frac{\text{intercept}_{\max} - \text{intercept}_{\min}}{2}$$
 
 
 ## 1.3 - Vectors and scalars
 
+!!! note "Definition"
+    - **Scalar:** A physical quantity with a numerical value (magnitude) and a unit.
+    - **Vector:** A physical quantity with a **non-negative** numerical value (magnitude), a unit, and a **direction.**
+
+??? example
+    - Scalar quantities include speed, distance, mass, temperature, pressure, time, frequency, current, voltage, and more.
+    - Vector quantities include velocity, displacement, acceleration, force (e.g., weight), momentum, impulse, and more.
+
+Vectors are drawn as arrows whose length represents their scale/magnitude and their orientation refer to their direction. A variable representing a vector is written with a right-pointing arrow above it.
+
+ - The **standard form** of a vector is expressed as its magnitude followed by its unit followed by its direction in square brackets.
+$$\vec{a} = 1\text{ m }[N 45° E]$$
+ - The **component form** of a vector is expressed as the location of its head on a cartesian plane if its tail were at $(0, 0)$.
+$$\vec{a} = (1, 1)$$
+ - The **magnitude** of a vector can be expressed as the absolute value of a vector.
+$$|\vec{a}| = 1 \text{ m}$$
+
+### Adding/subtracting vectors diagrammatically
+
+1. Draw the first vector.
+2. Draw the second vector with its tail at the head of the first vector.
+3. Repeat step 2 as necessary for as many vectors as you want by attaching them to the *head* of the last vector.
+4. Draw a new ("resultant") vector from the tail of the first vector to the head of the last vector.
+
+<img src="/resources/images/vector-add-direction.png" width=700>(Source: Kognity)</img>
+
+When subtracting exactly one vector from another, repeat the steps above, but instead place the second vector at the **tail** of the first, then draw the resultant vector from the head of the second vector to the head of the first vector. Note that this only applies when subtracting exactly one vector from another.
+
+!!! example
+    In the diagram above, $\vec{b}=\vec{a+b}-\vec{a}$.
+
+Alternatively, for any number of vectors, negate the vector(s) being subtracted by **giving it an opposite direction** and then add the negative vectors.
+
+<img src="/resources/images/vector-subtract-direction.png" width=700>(Source: Kognity)</img>
+
+### Adding/subtracting vectors algebraically
+
+Vectors can be broken up into two **component vectors** laying on the x- and y-axes via trigonometry such that the resultant of the two components is the original vector. This is especially helpful when adding larger (3+) numbers of vectors.
+$$\vec{F}_x + \vec{F}_y = \vec{F}$$
+
+!!! info "Reminder"
+    The **component form** of a vector is expressed as $(|\vec{a}_x|, |\vec{a}_y|)$
+
+<img src="/resources/images/vector-simple-adding.png" width=700>(Source: Kognity)</img>
+
+By using the primary trignometric identities:
+$$
+|\vec{a}_{x}| = |\vec{a}|\cos\theta_{a} \\
+|\vec{a}_{y}| = |\vec{a}|\sin\theta_{a}
+$$
+
+<img src="/resources/images/vector-decomposition.png" width=700>(Source: Kognity)</img>
+
+Using their component forms, to:
+
+ - add two vectors, add their x- and y-coordinates together.
+ - subtract two vectors, subtract their x- and y-coordinates together.
+
+$$
+(a_{x}, a_{y}) + (b_{x}, b_{y}) = (a_{x} + b_{x}, a_{y} + b_{y}) \\
+(a_{x}, a_{y}) - (b_{x}, b_{y}) = (a_{x} - b_{x}, a_{y} - b_{y})
+$$
+
+The length of resultant vector can then be found using the Pythagorean theorem.
+
+$$
+|\vec{c}|=\sqrt{c_{x}^2 + c_{y}^2}
+$$
+
+To find the resultant direction, use inverse tan to calculate the angle of the vector using the lengths of its components.
+
+$$
+\theta_{c} = \tan^{-1}(\frac{c_y}{c_x})
+$$
+
+### Multiplying vectors and scalars
+
+The product of a vector multiplied by a scalar is a vector with a magnitude of the vector multiplied by the scalar with the same direction as the original vector.
+
+$$\vec{v} × s = (|\vec{v}|×s)[\theta_{v}]$$
+
+!!! example
+    $$3 \text{ m} · 47 \text{ ms}^{-1}[N20°E] = 141 \text{ ms}^{-1}[N20°E]$$
+
+## 2.1 - Motion
+
+### Models
+
+A **scientific model** is a simplification of a system based on assumptions used to explain or make predictions for that system.
+
+!!! note "Definition"
+    - **System**: An object or a connected group of objects.
+    - **Point particle assumption**: An assumption that models a system as a blob of matter. It is more reliable if the size and shape of the object(s) do not matter much.
+    - **Uniform motion**: The type of motion in which the speed of an object is constant.
+
+### Displaying motion
+
+Motion can be expressed visually using a **motion diagram** or a **position-time graph**.
+
+// TODO: insert motion diagram here because kognity bad
+
+A **position-time graph** expands on the motion diagram by specifying a precise **position** value on the vertical axis in addition to time on the horizontal axis. The line of best fit indicates the object's speed, as well as if it is accelerating or decelerating.
+
+<img src="/resources/images/position-time-graph.png" width=700>(Source: Kognity)</img>
+
+When the slope is:
+
+ - linear, the object is moving at a constant speed.
+ - exponential, the object is accelerating.
+ - logarithmic, the object is decelerating.
+
+## 2.2 - Forces
+
+## 2.3 - Work, energy, and power
+
+## 2.4 - Momentum and impulse
+
+## 3.1 - Thermal concepts
+
+## 3.2 - Modelling a gas
+
 ## Resources
 
  - [IB Physics Data Booklet](/resources/g11/ib-physics-data-booklet.pdf)