mimimis
Merge branch 'master' of
ssh://git@github.com/java-computaria/Javagenda.git

Conflicts:
	.project