Signed-off-by: chedly <chedly@PC>
Merge branch 'master' of
ssh://git@github.com/chedlyhafaiedh/psychoRepo.git

Conflicts:
	tn.edu.esprit.psychopathes.tunisianWatchEJB/ejbModule/tn/edu/esprit/gl8/tunisianWatch/domain/B.java