Merge origin/master

Conflicts:
	eksamen/src/eksamen/Eksamen.java