new Branch for workingL
clean up code: now you can switch between local and server url in the functions.py
fix merge error