Lagt till lite om logfilen
Merge branch 'master' of https://github.com/Malllm/compsec.git

Conflicts:
	comsec/bin/AuthenticationManager.class
	comsec/bin/server.class
	comsec/src/server.java