Merge branch 'master' of http://git.choozmo.com:3000/choozmo/ArkCard-Linebot into master

.gitignore

@@ -1,2 +1,2 @@
 .DS_Store
-qrcode
+

main.py

@@ -175,7 +175,7 @@ def receive(userid):
         return "ERROR: User Not Found"
     else:
         result = table.find_one(userid=userid)
-        return {"userid": result['userid'], "url": "/qrcode/" + userid +".png", "useraddress": result['useraddress']}
+        return {"userid": result['userid'], "base": result['base'], "useraddress": result['useraddress']}
 
 # send handler
 @app.post("/send")