En cours matching
Merge branch 'master' of https://github.com/sdefauw/CarPooling
Proposal changé -> LinkedList
Matching en cours
ProposalManager, TrajectManager
Merge branch 'master' of https://github.com/sdefauw/CarPooling
Matching sans BD ni GM
Merge branch 'master' of https://github.com/sdefauw/CarPooling
Object modified
change proposal
Object add fct
Itin fit added
Merge branch 'master' of https://github.com/sdefauw/CarPooling

Conflicts:
	carpooling/app/controllers/ProposalManager.java
	carpooling/app/models/objects/Proposal.java
Proposal
Merge branch 'gui' of https://github.com/sdefauw/CarPooling