update ah
Merge branch 'origin/master'

Conflicts:
	OOP-Eksamen/AuctionHouse.cs
	OOP-Eksamen/Program.cs