diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..62c8935
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.idea/
\ No newline at end of file
diff --git a/api.py b/api.py
index 0d9c711..2d211b8 100644
--- a/api.py
+++ b/api.py
@@ -1,90 +1,104 @@
+# -*- coding: utf-8 -*-
+# ======= Workflow of this Bot ======
+# 1. Some people X tweet a Fake New and don't know
+# 2. Our bot take look this (search on our DB)
+# 3. Send tweet to this people X with and image (macro_link)
 from flask import Flask, render_template
 import tweepy, time, sys
 from time import sleep
 from random import randint
 from tweepy.streaming import StreamListener
 from tweepy import OAuthHandler
-from tweepy import Stream 
+from tweepy import Stream
 from flask import jsonify
 from flask import request
 
 app = Flask(__name__, template_folder="mytemplate")
 
 # Authentication
-t_consumerkey= 'ONoYgdpRdkIj592dVQJi52Qsg'
-t_secretkey= 'hn9y9Y7SBK5tiHWMVUKn6PRbUBUANjUX1aXcD9vwrpoTBFp8FJ'
-access_tokenkey='846743565904564224-We0haZK8x9XomN18ITn9cSxqlYwouX5'
-access_tokensecret='ValzlTvpS0Gq2SJAksUvvfyxm9N3a5o8dhSLJJrZzS6Ex'
-
+"""t_consumerkey = 'ONoYgdpRdkIj592dVQJi52Qsg'
+t_secretkey = 'hn9y9Y7SBK5tiHWMVUKn6PRbUBUANjUX1aXcD9vwrpoTBFp8FJ'
+access_tokenkey = '846743565904564224-We0haZK8x9XomN18ITn9cSxqlYwouX5'
+access_tokensecret = 'ValzlTvpS0Gq2SJAksUvvfyxm9N3a5o8dhSLJJrZzS6Ex'"""
 
+# Diego's Twitter Auth
+t_consumerkey = 'WwbzcQ5vuuZotIlNTUeCbwR9o'
+t_secretkey = 'YszgsQ0KgwaWKlooHPNSM9Mlh7uL4gsvfM1i1Jd9hB03e1MLAD'
+access_tokenkey = '632188701-8Eq3p0ohbQhZKKvFGQz1lRd41gNe90LfMblDM7Dy'
+access_tokensecret = 'ehFUrDFKcYhu0zgivsVVTCgr4RfZNmsTrMiw9sLATSj4w'
 
 auth = tweepy.OAuthHandler(t_consumerkey, t_secretkey)
 auth.set_access_token(access_tokenkey, access_tokensecret)
 
 api = tweepy.API(auth)
 
+menssage_es = "Parece ser que ésta noticia es falsa. Aquí tengo una recomendación para ti "
+
 
 @app.route('/twitter/')
-def Go_bots():
-	args = request.args
-	article_links_array = args.getlist('article_links')
-	hashtags_array = args.getlist('hashtags')
-	macro_link = args['macro_link']
-	tweet_text = args['tweet_text']
-	
-	
-	search_result_article = []
-	search_result_hashtag = []
-	for article in article_links_array:
-		search_result_article.append(api.search(article))
-	
-	for hashtag in hashtags_array:
-		search_result_hashtag.append(api.search('#'+hashtag))
-	all_tweets_text = []
-	
-	for tweets_a in search_result_article:
-		for t in tweets_a:
-		handle = "@" + t.user.screen_name
-		m_a = handle + " " + macro_link
-		all_tweets_text.append(m_a)
-		s = api.update_status(m_a)
-#		nap = randint(1, 60)
-		time.sleep(50)
-	
-	for tweets in search_result_hashtag:
-		for tweet in tweets:
-			handle = "@" + tweet.author.screen_name
-			m = handle + " " + macro_link
-			all_tweets_text.append(m)
-	##		s = api.update_status(m)
-	#		nap = randint(1, 60)
-			time.sleep(50)
+def go_bots():
+    """
+    article_link: array
+    hashtags: array
+    macro_link: image_url
+    tweet_text: string
+    """
+    args = request.args
+    article_links_array = args.getlist('article_links')  # This is what bots search on twitter to target people
+    hashtags_array = args.getlist('hashtags')  # Relevant hashtags
+    macro_link = args['macro_link']  # Illustrative image to raise awareness
+    tweet_text = args['tweet_text']  # Tweet text
+
+    search_result_article = []
+    search_result_hashtag = []
+    for article in article_links_array:  # TODO: identify false news by keywords
+        search_result_article.append(api.search(article))
+
+    for hashtag in hashtags_array:  # TODO: identify false news by hashtags
+        search_result_hashtag.append(api.search('#' + hashtag))
+
+    all_tweets_text = []  # List for output that tweets realized
+
+    for tweets_a in search_result_article:
+        for t in tweets_a:
+            handle = "@" + t.user.screen_name
+            m_a = menssage_es + " " + handle + " " + macro_link
+            all_tweets_text.append(m_a)
+            s = api.update_status(m_a)  # this send our recommendation
+            # nap = randint(1, 60)  # I don't know what's this
+            time.sleep(50)  # To avoid Twitter banning
+
+    for tweets in search_result_hashtag:
+        for tweet in tweets:
+            handle = "@" + tweet.author.screen_name
+            m = menssage_es + " " + handle + " " + macro_link
+            all_tweets_text.append(m)
+            # s = api.update_status(m)
+            # nap = randint(1, 60)
+            #time.sleep(50)
 
 ### Streaming part commented
 
-	# name = 'bakerk200'
-
-	# class StdOutListener(StreamListener):
-		# search_result2 = api.search(name)
-		
-		# for t in search_result2:
-			# if(t.user.screen_name is name):
-				# handle2 = "@" + t.user.screen_name
-				# m2 = handle2 + " " + "good"
-				#####s2 = api.update_status(m2)
-				# nap = randint(1, 60)
-				# time.sleep(nap)
-
-	# l = StdOutListener()
-	# stream = Stream(auth, l)
-	# print(search_result_article)
-	# print(search_result_hashtag)
-	
-	
-	
-	return jsonify({"tweets": all_tweets_text})
-    
-   
-
-if(__name__) == '__main__':
+    # name = 'bakerk200'
+
+    # class StdOutListener(StreamListener):
+        # search_result2 = api.search(name)
+
+        # for t in search_result2:
+            # if(t.user.screen_name is name):
+            # handle2 = "@" + t.user.screen_name
+            # m2 = handle2 + " " + "good"
+            #####s2 = api.update_status(m2)
+            # nap = randint(1, 60)
+            # time.sleep(nap)
+
+            # l = StdOutListener()
+            # stream = Stream(auth, l)
+            # print(search_result_article)
+            # print(search_result_hashtag)
+
+    return jsonify({"tweets": all_tweets_text})
+
+
+if __name__ == '__main__':
     app.run(debug=True)
diff --git a/requeriments.txt b/requeriments.txt
new file mode 100644
index 0000000..59b5327
--- /dev/null
+++ b/requeriments.txt
@@ -0,0 +1,15 @@
+certifi==2017.7.27.1
+chardet==3.0.4
+click==6.7
+Flask==0.12.2
+idna==2.6
+itsdangerous==0.24
+Jinja2==2.9.6
+MarkupSafe==1.0
+oauthlib==2.0.4
+requests==2.18.4
+requests-oauthlib==0.8.0
+six==1.11.0
+tweepy==3.5.0
+urllib3==1.22
+Werkzeug==0.12.2