updates
Merge branch 'master' of https://github.com/amatt13/OOP-Eksamen

Conflicts:
	OOP-Eksamen/Program.cs