debut de page de recherche
Merge branch 'master' of https://github.com/bobbylavoie/projets6info
resultat recherceh
Merge branch 'master' of https://github.com/bobbylavoie/projets6info

Conflicts:
	Workspace/Jack/src/com/sPirates/Jack/client/ResultatPresenter.java
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/server/guice/ServerModule.class
Enlevé des trucs du dernier commit