Trying to fix merge conflicts

templates/about.html

templates/add-workspace-result.html

templates/add-workspace.html

templates/contact-us.html

templates/home.html

templates/login.html

templates/main.html

templates/map.html

testwebpage.html

workspaces.json