Arbejdet i TeamMember
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Entities/TeamMember.java