Update

history.md

@@ -38,6 +38,8 @@ Also in 1888 probably the **first [video](video.md)** that survived until today
 
 On December 17 1903 the Wright brothers famously performed the **first controlled flight of a motor airplane** which they built, in North Carolina. In repeated attempts they flew as far as 61 meters over just a few seconds.
 
+From 1914 to 1918 there was **[World War I](ww1.md)**.
+
 Around 1915 [Albert Einstein](einstein.md), a German physicist, completed his **[General Theory of Relativity](relativity.md)**, a groundbreaking physics theory that describes the fundamental nature of space and time and gives so far the best description of the Universe since [Newton](newton.md). This would shake the world of science as well as popular culture and would enable advanced technology including nuclear energy, space satellites, high speed computers and many others.
 
 Int 1907 Lee De Forest invented a practically usable **[vacuum tube](vacuum_tube.md)**, an extremely important part usable in electric devices for example as an amplifier or a switch -- this would enable construction of radios, telephones and later even primitive computers. The invention would lead to the [electronic](electronics.md) revolution.
@@ -50,9 +52,11 @@ In 1931 [Kurt Gödel](kurt_godel.md), a genius mathematician and logician from A
 
 In 1938 [Konrad Zuse](konrad_zuse.md), a German engineer, constructed **[Z1](z1.md), the first working electric mechanical [digital](digital.md) partially programmable computer** in his parents' house. It weighted about a ton and wasn't very reliable, but brought huge innovation nevertheless. It was programmed with punched film tapes, however programming was limited, it was NOT [Turing complete](turing_complete.md) and there were only 8 instructions. Z1 ran on a frequency of 1 to 4 Hz and most operations took several clock cycles. It had a 16 word memory and worked with [floating point](float.md) numbers. The original computer was destroyed during the war but it was rebuilt and nowadays can be seen in a Berlin museum.
 
+From 1939 to 1945 there was **[World War II](ww2.md)**.
+
 In hacker culture the period between 1943 (start of building of the [ENIAC](eniac.md) computer) to about 1955-1960 is known as the **Stone Age of computers** -- as the [Jargon File](jargon_file.md) puts it, the age when electromechanical [dinosaurs](dinosaur.md) ruled the Earth.
 
-In 1945 the construction of **the first electronic digital fully programmable computer** was completed at University of Pennsylvania as the US Army project. It was named **[ENIAC](eniac.md)** (Electronic Numerical Integrator and Computer). It used 18000 vacuum tubes and 15000 relays, weighted 27 tons and ran on the frequency of 5 KHz. [Punch cards](punch_card.md) were used to program the computer in its machine language; it was [Turing complete](turing_complete.md), i.e. allowed using branches and loops. ENIAC worked with signed ten digit decimal numbers.
+In 1945 the construction of **the first electronic digital fully programmable computer** was completed at University of Pennsylvania as the US Army project. It was named **[ENIAC](eniac.md)** (Electronic Numerical Integrator and Computer). It used 18000 vacuum tubes and 15000 relays, weighted 27 tons and ran on the frequency of 5 KHz. [Punch cards](punch_card.md) were used to program the computer in its machine language; it was [Turing complete](turing_complete.md), i.e. allowed using branches and loops. ENIAC worked with signed ten digit decimal numbers. Also in 1945 **[USA](usa.md) used two nuclear bombs to murder hundreds of thousands of civilians** in Japanese cities Hiroshima and Nagasaki.
 
 Among hackers the period between 1961 to 1971 is known as the **Iron Age of computers**. The period spans time since the first minicomputer ([PDP1](pdp1.md)) to the first microprocessor ([Intel 4004](intel4004.md)). This would be followed by so called *elder days*.