Server, ferdigt for test
Merge branch 'master' into Erik2

Conflicts:
	src/data/Main.java
	src/data/Server.java