Timeout and magic!
Merge branch 'master' of https://github.com/hanssonr/examensarbete

Conflicts:
	src/codename/network/src/se/rhel/Server.java
	src/codename/network/src/se/rhel/TcpConnection.java