Merge branch 'master' of https://github.com/thenamesweretakenalready/Sv443s-JokeAPI-Python-Wrapper

Author: benjhar

MANIFEST

@@ -0,0 +1,5 @@
+# file GENERATED by distutils, do NOT edit
+setup.cfg
+setup.py
+jokeapi/__init__.py
+jokeapi/main.py

jokeapi/main.py

@@ -81,10 +81,14 @@ def build_request(
                 search_string = urllib.parse.quote(search_string)
         if id_range:
 
+<<<<<<< HEAD
             response = self.http.request(
                                         'GET',
                                         "https://sv443.net/jokeapi/v2/info"
                                         )
+=======
+            response = self.http.request('GET', "https://sv443.net/jokeapi/v2/info")
+>>>>>>> adf582966ed869e69c96a36f963ea2a4ac76e55b
             dict = json.loads(response.data)
             range_limit = dict["jokes"]["totalCount"]