info change log update + merge conflict

1 files changed, 26 insertions, 0 deletions

diff --git a/extrattyponies/surprise.pony b/extrattyponies/surprise.pony
new file mode 100644
index 0000000..e4a4937
--- /dev/null
+++ b/extrattyponies/surprise.pony
@@ -0,0 +1,26 @@
+$balloon35$]P7aaaaaa]Pfffffff
+                                $\$
+                                 $\$
+                                  $\$
+                             ]Pfd7d75f▄▄▄   ]Pfd7d75f▄]P7ffffaf▀▀]P7d7d75f  ▄        ]P7aaaaaa]Pfffffff
+                          ]Pfd7d75f▄]P7ffffaf▀▀   ▀▄]P7ffffaf▀ ▄▀  ]P7d7d75f         ]P7aaaaaa]Pfffffff
+                        ]Pfd7d75f▄]P7ffffaf▀]P7d7d75f ]P7ffffaf ]Pfd0d0d0▄]P7eeeeee▀▀]P7d0d0d0 ]P7ffffaf ]Pfd7d75f▀  ▄▀  ]P7d7d75f ]P7ffffaf▀▀▄     ]P7aaaaaa]Pfffffff
+                        ]P7d7d75f ]P7ffffaf ]Pfd7d75f▀]Pfd0d0d0▄]P7eeeeee▀]Pfe4e4e4▄ ]P7d0d0d0 ]P7d7d75f]Pfeeeeee▄▄▄▄▄]Pfffffaf▀▀]P7ffffaf  ]P7d7d75f▀▄ ▄▄▄]Pfd7d75f▄ ]P7aaaaaa]Pfffffff
+                        ]P7d7d75f ]P7ffffaf  ]P7d0d0d0 ]P7eeeeee ]P7d0d0d0 ]P7eeeeee         ]Pfd7d75f▀]P7ffffaf▄ ]P7d7d75f ]Pfffffaf▀▀]P7ffffaf   ]P7d7d75f ]P7aaaaaa]Pfffffff
+                        ]Pfd7d75f▀]P7ffffaf▄ ]P7d0d0d0▄]P7eeeeee    ]Pf000000▀▄]P7ffffff▀▀]Pfd0d0d0▀]P7eeeeee]Pf000000▄  ]Pfd0d0d0▀]P7d7d75f▄   ]P7d7d75f ]P7ffffaf  ]P7d7d75f ]P7aaaaaa]Pfffffff
+                         ]Pfd7d75f▀]P7ffffaf▄]P7d7d75f ]Pfd0d0d0▀]P7eeeeee  ]Pf000000▀▀]P7ffffff  ]P7d7afd7 ]P7ffffff▀ ]P7000000 ]P7eeeeee  ]P7d0d0d0  ]P7d7d75f  ]Pfffffaf▀▀]Pfd7d75f▀ ]P7aaaaaa]Pfffffff
+        ]Pfd7d75f▄]P7d7d75f ]P7ffffaf▀▀▀▀▀▄      ]Pfd7d75f▄]P7ffffaf▀▀▀ ▀ ▀]P7eeeeee▄ ]Pf000000▀]P7ffffff  ]P7d7afd7 ]P7000000 ]P7ffffff▀]P7000000 ]P7eeeeee  ]P7d0d0d0  ]Pfd7d75f▀▄▄   ]P7aaaaaa]Pfffffff
+       ]P7d7d75f ]Pfffffaf▄]P7ffffaf ]P7d7d75f▀▄▄▄▄▀▄]Pfd7d75f▄    ]P7d7d75f ]Pfffffaf▀]P7ffffaf  ]P7d7d75f▀▄▄▀]Pfeeeeee▄]P7eeeeee ]Pfd0d0d0▀▄]Pfffffff▀]P7ffffff ]Pfd7afd7▀▀]P7e4e4e4]Pfeeeeee▄]P7eeeeee ]P7e4e4e4▀]P7d0d0d0▄       ]P7aaaaaa]Pfffffff
+   ]Pfd7d75f▄▄▄ ]P7d7d75f ]P7ffffaf ]P7d7d75f ]P7ffffaf   ]Pfd7d75f▄▄▄▀▄]P7d7d75f    ]P7d7d75f ]P7ffffaf ]Pfd7d75f▀▄▄▀▀ ▀]P7eeeeee▄        ]P7d0d0d0 ]Pfeeeeee▀]Pfd0d0d0▀      ]P7aaaaaa]Pfffffff
+ ]Pfd7d75f▄]P7ffffaf▀   ▀▀]P7d7d75f ]P7ffffaf ]P7d7d75f ]P7ffffaf   ]P7d7d75f  ]Pfd7d75f▀]P7ffffaf▄▀▀▄]Pfd0d0d0▄▄]P7d7d75f▄▄]Pfffffaf▀▀▄▄▀]P7ffffaf  ]P7d7d75f ]P7eeeeee ]P7d0d0d0 ]Pfd0d0d0▀▀▀▀▀         ]P7aaaaaa]Pfffffff
+ ]P7d7d75f ]P7ffffaf     ]Pfd7d75f▄▄▄]P7d7d75f ]Pfffffaf▀]P7ffffaf   ]P7d7d75f   ]Pfd7d75f▀]P7d0d0d0 ]P7eeeeee ]Pfd7afd7▄▄  ]P7d0d0d0]Pfd7d75f▄]P7ffffaf▀ ]P7d7d75f ]P7ffffaf   ]P7d7d75f ]P7eeeeee ]P7d0d0d0               ]P7aaaaaa]Pfffffff
+ ]Pfd7d75f▀]P7ffffaf▄  ]P7d7d75f ]P7ffffaf▀  ▄▄▄▄  ]P7d7d75f   ]P7d0d0d0 ]P7eeeeee]Pfd7afd7▄▄▀▀]P7d0d0d0 ]Pfe4e4e4▄]P7d7d75f]Pfeeeeee▄]Pfffffaf▀]P7ffffaf ]P7d7d75f▀ ▀]Pfeeeeee▄]P7eeeeee  ]P7d0d0d0               ]P7aaaaaa]Pfffffff
+  ]Pfd7d75f▀]P7ffffaf▄ ▀▄  ]P7d7d75f ]Pfffffaf▀▀▀ ]Pfd7d75f▀   ]P7d0d0d0 ]P7d7afd7]Pfeeeeee▄ ]P7eeeeee ]P7d7afd7 ]Pfd0d0d0▀]P7eeeeee▄]Pfe4e4e4▀]Pfd7d75f▄]P7e4e4e4▄]P7ffffaf▄]P7d7d75f ]P7eeeeee   ]P7d0d0d0                ]P7aaaaaa]Pfffffff
+   ]Pfd7d75f▄]P7ffffaf▀ ▀▄      ]P7d7d75f     ]P7d0d0d0 ]P7eeeeee  ]Pfd7afd7▀]Pfd0d0d0▄▀▀▀▀▀  ▄]P7afaf87▀                ]P7aaaaaa]Pfffffff
+  ]P7d7d75f ]P7ffffaf  ]Pfd7d75f▄▄▄▀▀▄▄▄  ]P7d7d75f  ]Pfd0d0d0▄]P7eeeeee▀▀ ▄]P7afaf87▀]P7e4e4e4▀]P7afaf87▀▀▀]P7d0d0d0 ]P7eeeeee  ]P7d0d0d0 ]P7afaf87]Pfe4e4e4▄                 ]P7aaaaaa]Pfffffff
+  ]P7d7d75f ]Pfffffaf▀ ▄]P7ffffaf ]P7d7d75f▀ ]P7ffffaf ]P7d7d75f▀▄]P7ffffaf   ]P7d7d75f  ]P7d0d0d0 ]P7eeeeee  ]Pfd0d0d0▄]P7e4e4e4▀ ]P7afaf87    ]P7d0d0d0 ]P7eeeeee  ]P7d0d0d0 ]P7e4e4e4 ]P7afaf87                 ]P7aaaaaa]Pfffffff
+   ]Pfd7d75f▀]P7d7d75f ]P7ffffaf▀▀▀  ▀▄ ▄▀ ]Pfd0d0d0▄]P7eeeeee▀  ]P7d0d0d0 ]P7e4e4e4  ]P7afaf87    ]P7d0d0d0 ]P7eeeeee   ]P7d0d0d0 ]P7e4e4e4 ]P7afaf87                ]P7aaaaaa]Pfffffff
+  ]P7d7d75f  ]Pfd7d75f▀]P7ffffaf▄ ▀]P7d7d75f ▀▀▀▀   ]P7d0d0d0 ]P7eeeeee   ]P7d0d0d0 ]P7e4e4e4  ]P7afaf87    ]P7d0d0d0 ]P7eeeeee   ]P7d0d0d0 ]P7e4e4e4 ]Pfafaf87▀▄              ]P7aaaaaa]Pfffffff
+  ]Pfd7d75f▀]P7d7d75f  ]P7ffffaf▀▀  ]P7d7d75f      ]Pfd0d0d0▄]P7eeeeee▀   ]P7d0d0d0 ]P7e4e4e4  ]P7afaf87    ]P7d0d0d0 ]P7eeeeee    ]P7d0d0d0 ]P7e4e4e4 ]Pfafaf87▀]P7afaf87              ]P7aaaaaa]Pfffffff
+     ]Pfd7d75f▀▀▀▀      ]P7d0d0d0 ]P7eeeeee    ]P7d0d0d0 ]Pfafaf87▀▀▀   ]Pfd0d0d0▀]P7eeeeee▄   ▀]P7d0d0d0 ]Pfafaf87▀▀             ]P7aaaaaa]Pfffffff
+               ]Pfd0d0d0▀▀▀▀▀▀       ]Pfd0d0d0▀▀▀▀▀▀               ]P7aaaaaa]Pfffffff