plop
Merge branch 'master' of https://github.com/tvillemo/genindex

Conflicts:
	src/Database.java