vage shit, trying to make stuff work...
Merge branch 'master' of https://github.com/NickyL/INFOB2KI-B

Conflicts:
	search.py