Refactor match model
Merge branch 'master' of https://github.com/mathieuchartier/mcm

Conflicts:
	MatchModel.hpp