JS, adding new functions, working on Quickfill docs
merge conflict resolved
conflict city