Merge remote-tracking branch 'origin/master'

# Conflicts:
#	magic.py

magic.py

@@ -194,7 +194,7 @@ def stat_upload():
         'Content-Type': 'application/json; charset=utf-8'
     }
     # noinspection HttpUrlsUsage
-    stat_upload_url = 'https://ssleg.tech/stat_up'
+    stat_upload_url = 'https://api.ssleg.tech/v1/stat_up'
     hash_md5 = md5(bot_key.encode())
     request_json = {'protocol_version': '1.1', 'application': 'Magic Wand', 'app_version': get_my_version(),
                     'uptime': get_up_seconds(), 'errors': error_count.get(), 'fingerprint': hash_md5.hexdigest()}