maj
Merge branch 'master' of https://github.com/freezz/FarmCrush

Conflicts:
	FarmCrush/src/vue/JeuCandyCrush.java