EGit conflict test
Merge branch 'master' of https://github.com/ikoddn/INF5040-Obl1.git

Conflicts:
	INF5040-Obl1/src/no/uio/inf5040/obl1/server/ServerParser.java