Sletter Niklas jar fil
Merge branch 'master' of https://github.com/Distribuerede-systemer/server

Conflicts:
	.classpath