global trajectoire et points# Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/pangel/ens2012-pj

Conflicts:
	GlobalData.java
	SegmentTrajectory.java
conflits