Commit 4b3a420e authored by Steve Androulakis's avatar Steve Androulakis
Browse files

Merge branch 'some-cats' into 'master'

a cat

See merge request !4
parents 49e040bb ab957d5b
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,14 @@ minutes until forking.
Thank you for flying with MeRC Air.
Some cats
(. \
\ |
\ |___(\--/)
__/ ( . . )
"'._. '-.O.'
'-. \ "|\
Change proposed by Shahaan.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment