first try solving pull error

README.md

@@ -40,3 +40,7 @@ For the bot_user_id run the commands
 myinfo = api.get_my_info()
 print(myinfo)
 ```
+
+
+Information: It is important to change the settings for bots, otherwise with the standard conf
+the fdb-spider-interface does too many requests

fdb_spider_interface.py

@@ -39,8 +39,9 @@ if __name__ == '__main__':
 
     # api.send_message('Ciao, I am the fdb-spider', room_id)
 
-    # myinfo = api.get_my_info()
+    #myinfo = api.get_my_info()
 
+<<<<<<< HEAD
     #room_history = api.get_private_room_history(room_id)
 
     #print(room_history['messages'][0]['msg'])
@@ -49,6 +50,12 @@ if __name__ == '__main__':
     rooms = api.get_private_rooms()
 
     print('blubidab oioioi', rooms)
+=======
+    #print(myinfo)
+    #rooms = api.get_private_rooms()
+
+    #print(rooms)
+>>>>>>> origin/master
 
     # api.send_message('Ole', room_id)