gitignore
Merge branch 'master' of https://github.com/menboy/ATD_Login

Conflicts:
	.gitignore
	nbproject/private/private.xml
	war/WEB-INF/built-jar.properties
	war/WEB-INF/classes/model/agenda/Agenda.class