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
Merge branch 'devmax' into invitemax

Conflicts:
	bin/gui/Logg_inn$1.class
	bin/gui/Logg_inn.class
	bin/ymse/Event.class