hotfix
Merge branch 'master' of https://github.com/KaFuCh/OOP_Eksamen

Conflicts:
	OOP_Eksamen/OOP_Eksamen/Program.cs