Får jeg lov til å commite nå?
Update Member.java
Merge branch 'master' into Brage5

Conflicts:
	src/data/Main.java
commmmmmittgf
dsfgs
Server, ferdigt for test
sdfasdf
Merge branch 'master' into Erik2

Conflicts:
	src/data/Main.java
	src/data/Server.java
sfdhgthjssadfasdfca