Merge branch 'web' of https://gitlab.cas.mcmaster.ca/schankuc/2XB3 into

web

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.