dunno
Merge branch 'master' of https://github.com/thomasvanophem/Afstudeerproject

Conflicts:
	Source/Server/web/index.py
Fixed recursive