Depot de document
Merge branch 'master' of https://github.com/bobbylavoie/projets6info

Conflicts:
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/DepotDocumentPresenter$1.class
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/client/TablePresenter$1.class
	Workspace/Jack/war/WEB-INF/classes/com/sPirates/Jack/server/FileUploadServlet.class

update gitignore