merge
Merge branch 'search' of https://github.com/utwente-di/di10 into search

Conflicts:
	website/.gitignore
Merge branch 'search'