Commit
Merge branch 'master' of https://github.com/mamadidabo/projetPro.git
Merge branch 'master' of https://github.com/mamadidabo/projetPro.git

Conflicts:
	WebContent/home.jsp