push local
Merge branch 'master' of github.com:Logarithme/SegmentationMaillage

Conflicts:
	CMakeLists.txt