verplichte commit
Merge branch 'master' of https://github.com/Simon-Raes/Boelaert-Raes-ASP-Project

Conflicts:
	Boelaert-Raes-Project/LayeredBusinessModel.WebUI/Catalog.aspx
	Boelaert-Raes-Project/LayeredBusinessModel.WebUI/Catalog.aspx.cs