try
Merge branch 'master' of https://github.com/marthiam/Filrouge

Conflicts:
	initialBettingSW/src/fr/uv1/bettingServices/Competition.java