Merge branch 'master' of ssh://git.webschneider.org:1995/angerstoner/schneiderbot-tg

added kill

schneiderbot.py

@@ -108,6 +108,11 @@ def kill(bot, update):
     """kill me pls"""
     update.message.reply_text(update.message.from_user.first_name + " died")
 
+def sendCatDog(bot, update):
+    """Best of both worlds!"""
+    catdog = "https://upload.wikimedia.org/wikipedia/en/6/64/CatDog.jpeg"
+    bot.send_photo(chat_id=update.message.chat_id, photo=catdog)
+
 def magie(bot, update):
     """MAGIEEEEEE"""
     rand = random.SystemRandom()
@@ -193,6 +198,7 @@ def main():
     dp.add_handler(CommandHandler("mensa", mensa, pass_args=True))
     dp.add_handler(CommandHandler("cat", sendCat))
     dp.add_handler(CommandHandler("dog", sendDog))
+    dp.add_handler(CommandHandler("catdog", sendCatDog))
     dp.add_handler(CommandHandler("shrug", shrug))
     dp.add_handler(CommandHandler("kill", kill))