Merge branch 'master' of https://gitlab.erc.monash.edu.au/steveand/hpc-gitlearn

sunib nerge

essay

-Hello, my name is Steve and I'll be your git pilot today.
+Hello, we are Steve and Grischa and we'll be your git pilots today.
 
 We're just about to disembark onto the runway. There are a few other git
 projects ahead of us waiting to take off, so we'll have to wait 5 or 10
@@ -7,5 +7,18 @@ minutes until forking.
 Thank you for flying with MeRC Air.
 
 
-EXCUSE ME. What are the yellow masks dropping down from the roof?
 
+=======
+Some cats
+
+  ____
+  (.   \
+    \  |   
+     \ |___(\--/)
+   __/    (  . . )
+  "'._.    '-.O.'
+       '-.  \ "|\
+          '.,,/'.,,mrf
+Change proposed by Shahaan.
+
+EXCUSE ME. What are the yellow masks dropping down from the roof?