van alles wat
Merge branch 'sanderrr'

Conflicts:
	Website/pcbuilder/views.py