Merge branch 'patch-1' into 'master'

Update mars.txt See merge request !1

Merge branch 'patch-1' into 'master'
b51aa8ec · esadgrov · 3b826026 · fa381b5f · b51aa8ec
Commit b51aa8ec authored 7 years ago by esadgrov
--- a/mars.txt
+++ b/mars.txt
@@ -3,3 +3,4 @@ The two moons may be a problem for Wolfman
 But the Mummy will appreciate the lack of humidity
 the quick brown fox jumped over the lazy dog
 that is right the fox jumped you know, man...
+I am making a merge thing yaay
\ No newline at end of file