hoi ik ben rik
updatejee
Merge remote-tracking branch 'origin/master'

Conflicts:
	Website/APc/APc/__init__.pyc
	Website/APc/APc/settings.pyc
	Website/APc/APc/wsgi.pyc
	Website/APc/pcbuilder/__init__.pyc
	Website/APc/pcbuilder/admin.pyc
	Website/APc/pcbuilder/migrations/__init__.pyc
	Website/APc/pcbuilder/models.pyc
	Website/APc/templates/base.html