US 2
conflict
Merge branch 'master' of https://github.com/tvillemo/genindex.git

Conflicts:
	src/Database.java