Commit
commit
commit
commit
Merge branch 'devmax' into Hogne4

Conflicts:
	src/serverCommunication/ServerHandler.java
Merge branch 'Hogne4' of https://github.com/KennethAS/Fellesprosjekt into Hogne4

Conflicts:
	src/serverCommunication/ServerHandler.java
Merge pull request #38 from KennethAS/Hogne4

Hogne4