tetsts
Merge branch 'master' of https://github.com/martejs/Master-s-thesis

Conflicts:
	indexing/index.java