IHM to Andy
Je pete tout !
Merge branch 'master' of
https://github.com/workspacerg/__ALGO2013_2014.git

Conflicts:
	ratp/src/algo_ratp/Plan.java