Merge branch 'master' into some-cats

essay

 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 minutes until forking.
+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
+minutes until forking.
 
 Thank you for flying with MeRC Air.
 
@@ -15,3 +17,4 @@ Some cats
   "'._.    '-.O.'
        '-.  \ "|\
           '.,,/'.,,mrf
+Change proposed by Shahaan.

[Steve Androulakis]

Thanks for fixing this up