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

Conflicts:
	project/src/wireprotocol/server_messagehandler.h