Website merge

Merge of the following commit:

https://github.com/AuditeMarlow/NLX-Webshop/commit/27d9d975294432cfa29fbfc322ddb2630a9ef40f