Merge branch 'master' of github.com:jornpeters/TweedejaarsProject

Conflicts:
	src/DocumentLinker.py
	src/vectorizers/textvectorizer.py
Merge branch 'master' of github.com:jornpeters/TweedejaarsProject