from flask import Flask
app = Flask(__name__)


from pymongo import MongoClient

connection = MongoClient()


@app.route("/")
def hello():
	
        return connection.essa.users.find({}).next()['name']

<<<<<<< HEAD
#test

#test for this_new_feature
# another one

=======
#update master
>>>>>>> master

@app.route('/halla/<username>')
def hi(username):
	return "Halla " + username

@app.route('/add/<int:x>/<int:y>/')
def sum(x,y):
	return str( x+y)

@app.route('/test')
def test():
	return "test"

# deleted
	
app.debug = True

if __name__ == "__main__":
        app.run("0.0.0.0")




@@ -200,109 +200,8 @@
 '%5D%0A%0A
-%3C%3C%3C%3C%3C%3C%3C HEAD%0A#test%0A%0A#test for this_new_feature%0A# another one%0A%0A=======%0A#update master%0A%3E%3E%3E%3E%3E%3E%3E master%0A%0A
 @app
@@ -396,17 +396,8 @@
 t%22%0A%0A
-# deleted
 %0A%09%0Aa

Fix the comments