29/nov
Merge branch 'master' of https://github.com/GuillaumeSeg/PlantS

Conflicts:
	.metadata/.log
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.jdt.core/202954338.index
	.metadata/.plugins/org.eclipse.jdt.core/248515629.index
	.metadata/.plugins/org.eclipse.jdt.core/3066868210.index
	.metadata/.plugins/org.eclipse.jdt.core/700975423.index
	.metadata/.plugins/org.eclipse.jdt.core/973469047.index
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
recuperation projet
recuperation projet
recuperation projet
sq
Merge branch 'master' of https://github.com/GuillaumeSeg/PlantS

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.history/14/b00dc0ec633e00121df88c9591dd80a9
	.metadata/.plugins/org.eclipse.core.resources/.history/81/a09db450943f001215208f164308db19
	.metadata/.plugins/org.eclipse.core.resources/.history/94/90101d7b593e00121df88c9591dd80a9
	.metadata/.plugins/org.eclipse.core.resources/.history/94/a0aac582593e00121df88c9591dd80a9
	.metadata/.plugins/org.eclipse.core.resources/.history/9f/00131d86593e00121df88c9591dd80a9
	.metadata/.plugins/org.eclipse.core.resources/.history/b6/40c3be0a613e00121df88c9591dd80a9
	.metadata/.plugins/org.eclipse.core.resources/.history/d6/00d1c0ec633e00121df88c9591dd80a9
	.metadata/.plugins/org.eclipse.core.resources/.history/df/d0effd6b943f001215208f164308db19
	.metadata/.plugins/org.eclipse.core.resources/.history/e3/c0f2ea6d943f001215208f164308db19
	.metadata/.plugins/org.eclipse.core.resources/.history/ff/d097b6ec633e00121df88c9591dd80a9
	.metadata/.plugins/org.eclipse.core.resources/.projects/S1/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/S1/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.projects/S2/.indexes/7/17/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/S2/.indexes/7/2e/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/S2/.indexes/e4/17/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/S2/.indexes/e4/2e/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/S2/.indexes/e4/9c/history.index
	.metadata/.plugins/org.eclipse.core.resources/.projects/S2/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/S2/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.projects/S2/.syncinfo.snap
	.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.resources/.snap
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.jdt.core/2500954072.index
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/1.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/2.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/3.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/4.png
	.metadata/.plugins/org.eclipse.jdt.ui/jdt-images/5.png
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	S2/bin/renderer/JDOMHierarchy.class
	S2/bin/renderer/JOGLRenderer.class
	S2/bin/renderer/ShaderProgram.class
implementing axes reading