US 2 Working
Elodie gg
Merge branch 'master' of https://github.com/MDero/GenindexWeb

Conflicts:
	nbproject/private/private.properties