TAN
Merge branch 'master' of https://github.com/SebDuboisMIAGE/ProjetDWAR

Conflicts:
	Projet/src/servlets/ProjetServlet.java