merge
Merge branch 'master' of github.com:RobertBorg/SE-LTH-EDA031-VT13

Conflicts:
	Labs/lab4/src/vectornameserver.h
Merge branch 'master' of github.com:RobertBorg/SE-LTH-EDA031-VT13

# 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.