bildene komme ihvertfall opp ;)

beeing drunk is excellent for server configuration ;)
Merge branch 'master' of https://github.com/lkjell/DAT210-prosjekt-gruppe-D

Conflicts:
	src/server/Main.java
	src/server/TestServer.java