strat 2 triangles
Merge branch 'master' of github.com:utcoupe/coupe14
Merge branch 'master' of github.com:utcoupe/coupe14 into choix_objectif_FM

Conflicts:
	ia/event/goals/goalsChoice.py